CI: One-time yamlfix cleanups. No functional change intended.

This commit is contained in:
Wilson Snyder 2024-09-15 14:37:09 -04:00
parent 48a607cc78
commit 99a29acca0
9 changed files with 220 additions and 236 deletions

View File

@ -1,6 +1,6 @@
--- ---
exclude_paths: exclude_paths:
- '.github/**' - ".github/**"
- 'ci/build_verilator.sh' - "ci/build_verilator.sh"
- 'include/vltstd/**' - "include/vltstd/**"
- 'nodist/fastcov.py' - "nodist/fastcov.py"

View File

@ -1,3 +1,4 @@
---
# DESCRIPTION: Github actions config # DESCRIPTION: Github actions config
# This name is key to badges in README.rst, so we use the name build # This name is key to badges in README.rst, so we use the name build
# SPDX-License-Identifier: LGPL-3.0-only OR Artistic-2.0 # SPDX-License-Identifier: LGPL-3.0-only OR Artistic-2.0
@ -37,12 +38,12 @@ jobs:
matrix: matrix:
os: [ubuntu-24.04, ubuntu-22.04, ubuntu-20.04] os: [ubuntu-24.04, ubuntu-22.04, ubuntu-20.04]
compiler: compiler:
- { cc: clang, cxx: clang++ } - {cc: clang, cxx: clang++}
- { cc: gcc, cxx: g++ } - {cc: gcc, cxx: g++}
include: include:
# Build GCC 10 on ubuntu-20.04 # Build GCC 10 on ubuntu-20.04
- os: ubuntu-20.04 - os: ubuntu-20.04
compiler: { cc: gcc-10, cxx: g++-10 } compiler: {cc: gcc-10, cxx: g++-10}
runs-on: ${{ matrix.os }} runs-on: ${{ matrix.os }}
name: Build | ${{ matrix.os }} | ${{ matrix.compiler.cc }} name: Build | ${{ matrix.os }} | ${{ matrix.compiler.cc }}
env: env:
@ -86,7 +87,6 @@ jobs:
path: ${{ github.workspace }}/${{ env.VERILATOR_ARCHIVE }} path: ${{ github.workspace }}/${{ env.VERILATOR_ARCHIVE }}
name: ${{ env.VERILATOR_ARCHIVE }} name: ${{ env.VERILATOR_ARCHIVE }}
test: test:
needs: build needs: build
strategy: strategy:
@ -94,25 +94,25 @@ jobs:
matrix: matrix:
os: [ubuntu-22.04, ubuntu-20.04] os: [ubuntu-22.04, ubuntu-20.04]
compiler: compiler:
- { cc: clang, cxx: clang++ } - {cc: clang, cxx: clang++}
- { cc: gcc, cxx: g++ } - {cc: gcc, cxx: g++}
reloc: [0] reloc: [0]
suite: [dist-vlt-0, dist-vlt-1, dist-vlt-2, dist-vlt-3, vltmt-0, vltmt-1] suite: [dist-vlt-0, dist-vlt-1, dist-vlt-2, dist-vlt-3, vltmt-0, vltmt-1]
include: include:
# Test with GCC 10 on ubuntu-20.04, also test relocation # Test with GCC 10 on ubuntu-20.04, also test relocation
- {os: ubuntu-20.04, compiler: { cc: gcc-10, cxx: g++-10 }, reloc: 1, suite: dist-vlt-0} - {os: ubuntu-20.04, compiler: {cc: gcc-10, cxx: g++-10}, reloc: 1, suite: dist-vlt-0}
- {os: ubuntu-20.04, compiler: { cc: gcc-10, cxx: g++-10 }, reloc: 1, suite: dist-vlt-1} - {os: ubuntu-20.04, compiler: {cc: gcc-10, cxx: g++-10}, reloc: 1, suite: dist-vlt-1}
- {os: ubuntu-20.04, compiler: { cc: gcc-10, cxx: g++-10 }, reloc: 1, suite: dist-vlt-2} - {os: ubuntu-20.04, compiler: {cc: gcc-10, cxx: g++-10}, reloc: 1, suite: dist-vlt-2}
- {os: ubuntu-20.04, compiler: { cc: gcc-10, cxx: g++-10 }, reloc: 1, suite: dist-vlt-3} - {os: ubuntu-20.04, compiler: {cc: gcc-10, cxx: g++-10}, reloc: 1, suite: dist-vlt-3}
- {os: ubuntu-20.04, compiler: { cc: gcc-10, cxx: g++-10 }, reloc: 1, suite: vltmt-0} - {os: ubuntu-20.04, compiler: {cc: gcc-10, cxx: g++-10}, reloc: 1, suite: vltmt-0}
- {os: ubuntu-20.04, compiler: { cc: gcc-10, cxx: g++-10 }, reloc: 1, suite: vltmt-1} - {os: ubuntu-20.04, compiler: {cc: gcc-10, cxx: g++-10}, reloc: 1, suite: vltmt-1}
# Ubuntu 24.04 only on GCC; not passing on clang yet # Ubuntu 24.04 only on GCC; not passing on clang yet
- {os: ubuntu-24.04, compiler: { cc: gcc, cxx: g++ }, suite: dist-vlt-0} - {os: ubuntu-24.04, compiler: {cc: gcc, cxx: g++}, suite: dist-vlt-0}
- {os: ubuntu-24.04, compiler: { cc: gcc, cxx: g++ }, suite: dist-vlt-1} - {os: ubuntu-24.04, compiler: {cc: gcc, cxx: g++}, suite: dist-vlt-1}
- {os: ubuntu-24.04, compiler: { cc: gcc, cxx: g++ }, suite: dist-vlt-2} - {os: ubuntu-24.04, compiler: {cc: gcc, cxx: g++}, suite: dist-vlt-2}
- {os: ubuntu-24.04, compiler: { cc: gcc, cxx: g++ }, suite: dist-vlt-3} - {os: ubuntu-24.04, compiler: {cc: gcc, cxx: g++}, suite: dist-vlt-3}
- {os: ubuntu-24.04, compiler: { cc: gcc, cxx: g++ }, suite: vltmt-0} - {os: ubuntu-24.04, compiler: {cc: gcc, cxx: g++}, suite: vltmt-0}
- {os: ubuntu-24.04, compiler: { cc: gcc, cxx: g++ }, suite: vltmt-1} - {os: ubuntu-24.04, compiler: {cc: gcc, cxx: g++}, suite: vltmt-1}
runs-on: ${{ matrix.os }} runs-on: ${{ matrix.os }}
name: Test | ${{ matrix.os }} | ${{ matrix.compiler.cc }} | ${{ matrix.reloc && 'reloc | ' || '' }} ${{ matrix.suite }} name: Test | ${{ matrix.os }} | ${{ matrix.compiler.cc }} | ${{ matrix.reloc && 'reloc | ' || '' }} ${{ matrix.suite }}
env: env:

View File

@ -1,13 +1,12 @@
---
# DESCRIPTION: Github actions config # DESCRIPTION: Github actions config
# SPDX-License-Identifier: LGPL-3.0-only OR Artistic-2.0 # SPDX-License-Identifier: LGPL-3.0-only OR Artistic-2.0
#
name: Contributor Agreement name: Contributor Agreement
on: on:
push: push:
pull_request: pull_request:
workflow_dispatch: workflow_dispatch:
jobs: jobs:
Test: Test:
name: "'docs/CONTRIBUTORS' was signed" name: "'docs/CONTRIBUTORS' was signed"

View File

@ -1,3 +1,4 @@
---
# DESCRIPTION: Github actions config # DESCRIPTION: Github actions config
# SPDX-License-Identifier: LGPL-3.0-only OR Artistic-2.0 # SPDX-License-Identifier: LGPL-3.0-only OR Artistic-2.0
@ -21,7 +22,6 @@ defaults:
jobs: jobs:
Build: Build:
runs-on: ubuntu-22.04 runs-on: ubuntu-22.04
env: env:
@ -50,28 +50,15 @@ jobs:
path: ${{ github.workspace }}/${{ env.VERILATOR_ARCHIVE }} path: ${{ github.workspace }}/${{ env.VERILATOR_ARCHIVE }}
name: ${{ env.VERILATOR_ARCHIVE }} name: ${{ env.VERILATOR_ARCHIVE }}
Test: Test:
needs: Build needs: Build
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
test: test: [vlt-, vltmt-]
- vlt- num: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
- vltmt-
num:
- 0
- 1
- 2
- 3
- 4
- 5
- 6
- 7
- 8
- 9
include: include:
- { test: dist, num: '' } - {test: dist, num: ''}
runs-on: ubuntu-22.04 runs-on: ubuntu-22.04
name: test-${{ matrix.test }}${{ matrix.num }} name: test-${{ matrix.test }}${{ matrix.num }}
env: env:

View File

@ -1,3 +1,4 @@
---
# Build and push verilator docker image when tags are pushed to the repository. # Build and push verilator docker image when tags are pushed to the repository.
# The following variable(s) must be configured in the github repository: # The following variable(s) must be configured in the github repository:
# DOCKER_HUB_NAMESPACE: docker hub namespace. # DOCKER_HUB_NAMESPACE: docker hub namespace.
@ -8,7 +9,7 @@ name: Build Verilator Container
on: on:
push: push:
tags: [ 'v*' ] tags: ['v*']
workflow_dispatch: workflow_dispatch:
inputs: inputs:
manual_tag: manual_tag:

View File

@ -1,13 +1,12 @@
---
# DESCRIPTION: Github actions config # DESCRIPTION: Github actions config
# SPDX-License-Identifier: LGPL-3.0-only OR Artistic-2.0 # SPDX-License-Identifier: LGPL-3.0-only OR Artistic-2.0
#
name: format name: format
on: on:
push: push:
pull_request_target: pull_request_target:
workflow_dispatch: workflow_dispatch:
jobs: jobs:
format: format:
runs-on: ubuntu-22.04 runs-on: ubuntu-22.04

View File

@ -1,33 +1,28 @@
---
# DESCRIPTION: Github actions config # DESCRIPTION: Github actions config
# This name is key to badges in README.rst, so we use the name build # This name is key to badges in README.rst, so we use the name build
# SPDX-License-Identifier: LGPL-3.0-only OR Artistic-2.0 # SPDX-License-Identifier: LGPL-3.0-only OR Artistic-2.0
#
name: msbuild name: msbuild
on: on:
push: push:
pull_request: pull_request:
workflow_dispatch: workflow_dispatch:
schedule: schedule:
- cron: '0 0 * * 0' # weekly - cron: 0 0 * * 0 # weekly
env: env:
CI_OS_NAME: win CI_OS_NAME: win
CI_COMMIT: ${{ github.sha }} CI_COMMIT: ${{ github.sha }}
CCACHE_COMPRESS: 1 CCACHE_COMPRESS: 1
CCACHE_DIR: ${{ github.workspace }}/.ccache CCACHE_DIR: ${{ github.workspace }}/.ccache
CCACHE_LIMIT_MULTIPLE: 0.95 CCACHE_LIMIT_MULTIPLE: 0.95
defaults: defaults:
run: run:
working-directory: repo working-directory: repo
concurrency: concurrency:
group: ${{ github.workflow }}-${{ github.event_name == 'pull_request' && github.ref || github.run_id }} group: ${{ github.workflow }}-${{ github.event_name == 'pull_request' && github.ref || github.run_id }}
cancel-in-progress: true cancel-in-progress: true
jobs: jobs:
windows: windows:
name: run on windows name: run on windows
runs-on: windows-latest runs-on: windows-latest

View File

@ -458,6 +458,11 @@ clang-format:
|| echo "*** You are not using clang-format-14, indents may differ from master's ***" || echo "*** You are not using clang-format-14, indents may differ from master's ***"
$(CLANGFORMAT) $(CLANGFORMAT_FLAGS) $(CLANGFORMAT_FILES) $(CLANGFORMAT) $(CLANGFORMAT_FLAGS) $(CLANGFORMAT_FILES)
YAMLFIX = YAMLFIX_WHITELINES=1 YAMLFIX_LINE_LENGTH=130 YAMLFIX_preserve_quotes=true yamlfix
yamlfix:
$(YAMLFIX) .
# Python programs, subject to format and lint # Python programs, subject to format and lint
PY_PROGRAMS = \ PY_PROGRAMS = \
bin/verilator_ccache_report \ bin/verilator_ccache_report \

View File

@ -1,3 +1,4 @@
---
# DESCRIPTION: codecov.io config # DESCRIPTION: codecov.io config
# #
# Copyright 2020-2024 by Wilson Snyder. This program is free software; you # Copyright 2020-2024 by Wilson Snyder. This program is free software; you
@ -8,31 +9,28 @@
#################### ####################
# Validate: # Validate:
# curl --data-binary @codecov.yml https://codecov.io/validate # curl --data-binary @codecov.yml https://codecov.io/validate
#
codecov: codecov:
require_ci_to_pass: no require_ci_to_pass: false
coverage: coverage:
precision: 2 precision: 2
round: down round: down
range: "50...100" range: 50...100
ignore: ignore:
- "ci" - "ci" #
- "docs" - "docs" #
- "examples" - "examples" #
- "include/gtkwave" - "include/gtkwave" #
- "include/vltstd" - "include/vltstd" #
- "test_regress" - "test_regress" #
parsers: parsers:
gcov: gcov:
branch_detection: branch_detection:
conditional: yes conditional: true
loop: yes loop: true
method: no method: false
macro: no macro: false
comment: comment:
layout: "reach,diff,flags,tree" layout: "reach,diff,flags,tree"
behavior: default behavior: default
require_changes: yes require_changes: true