From 0629c9e78626ea54da9a689835d31257dbf66fc3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Marjam=C3=A4ki?= Date: Fri, 1 Sep 2023 18:03:25 +0200 Subject: [PATCH 1/3] ubuntu --- .github/workflows/CI-unixish-docker.yml | 2 +- .github/workflows/CI-unixish.yml | 2 +- .github/workflows/asan.yml | 2 +- .github/workflows/buildman.yml | 2 +- .github/workflows/cifuzz.yml | 2 +- .github/workflows/clang-tidy.yml | 2 +- .github/workflows/codeql-analysis.yml | 2 +- .github/workflows/coverage.yml | 2 +- .github/workflows/format.yml | 2 +- .github/workflows/iwyu.yml | 4 ++-- .github/workflows/scriptcheck.yml | 2 +- .github/workflows/selfcheck.yml | 2 +- .github/workflows/tsan.yml | 2 +- .github/workflows/ubsan.yml | 2 +- .github/workflows/valgrind.yml | 2 +- 15 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.github/workflows/CI-unixish-docker.yml b/.github/workflows/CI-unixish-docker.yml index 3558e6a5721..96df6fde8f5 100644 --- a/.github/workflows/CI-unixish-docker.yml +++ b/.github/workflows/CI-unixish-docker.yml @@ -15,7 +15,7 @@ jobs: image: ["centos:7", "ubuntu:14.04", "ubuntu:16.04", "ubuntu:18.04", "ubuntu:23.04"] fail-fast: false # Prefer quick result - runs-on: ubuntu-22.04 + runs-on: buildjet-2vcpu-ubuntu-2204 # TODO: is this actually applied to the guest? env: diff --git a/.github/workflows/CI-unixish.yml b/.github/workflows/CI-unixish.yml index 856229f6dfe..fbf1efc39ba 100644 --- a/.github/workflows/CI-unixish.yml +++ b/.github/workflows/CI-unixish.yml @@ -12,7 +12,7 @@ jobs: strategy: matrix: - os: [ubuntu-20.04, ubuntu-22.04, macos-11, macos-12] + os: [buildjet-2vcpu-ubuntu-2004, buildjet-2vcpu-ubuntu-2204, macos-11, macos-12] fail-fast: false # Prefer quick result runs-on: ${{ matrix.os }} diff --git a/.github/workflows/asan.yml b/.github/workflows/asan.yml index c29ecde8a4a..4a30565800f 100644 --- a/.github/workflows/asan.yml +++ b/.github/workflows/asan.yml @@ -10,7 +10,7 @@ permissions: jobs: build: - runs-on: ubuntu-22.04 + runs-on: buildjet-2vcpu-ubuntu-2204 env: QT_VERSION: 5.15.2 diff --git a/.github/workflows/buildman.yml b/.github/workflows/buildman.yml index 4bbdf779661..00cc66cb471 100644 --- a/.github/workflows/buildman.yml +++ b/.github/workflows/buildman.yml @@ -7,7 +7,7 @@ permissions: jobs: convert_via_pandoc: - runs-on: ubuntu-22.04 + runs-on: buildjet-2vcpu-ubuntu-2204 steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/cifuzz.yml b/.github/workflows/cifuzz.yml index 19c40de61c9..1964fa0c786 100644 --- a/.github/workflows/cifuzz.yml +++ b/.github/workflows/cifuzz.yml @@ -2,7 +2,7 @@ name: CIFuzz on: [pull_request] jobs: Fuzzing: - runs-on: ubuntu-latest + runs-on: buildjet-2vcpu-ubuntu-2204 steps: - name: Build Fuzzers id: build diff --git a/.github/workflows/clang-tidy.yml b/.github/workflows/clang-tidy.yml index 7bcd8bd8e31..5b249d92de4 100644 --- a/.github/workflows/clang-tidy.yml +++ b/.github/workflows/clang-tidy.yml @@ -10,7 +10,7 @@ permissions: jobs: build: - runs-on: ubuntu-22.04 + runs-on: buildjet-2vcpu-ubuntu-2204 env: QT_VERSION: 5.15.2 diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 12d15855527..a7aa2710324 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -9,7 +9,7 @@ permissions: jobs: analyze: name: Analyze - runs-on: ubuntu-22.04 + runs-on: buildjet-2vcpu-ubuntu-2204 strategy: fail-fast: false diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index b07c15811cd..5bea7c1f174 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -10,7 +10,7 @@ permissions: jobs: build: - runs-on: ubuntu-22.04 + runs-on: buildjet-2vcpu-ubuntu-2204 steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/format.yml b/.github/workflows/format.yml index ff3134b7ed5..7c92a4a45ec 100644 --- a/.github/workflows/format.yml +++ b/.github/workflows/format.yml @@ -10,7 +10,7 @@ permissions: jobs: build: - runs-on: ubuntu-22.04 + runs-on: buildjet-2vcpu-ubuntu-2204 steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/iwyu.yml b/.github/workflows/iwyu.yml index 1daa54ce203..98aeeab0ebc 100644 --- a/.github/workflows/iwyu.yml +++ b/.github/workflows/iwyu.yml @@ -14,7 +14,7 @@ jobs: matrix: image: ["fedora:latest"] # "debian:unstable" / "archlinux:latest" - runs-on: ubuntu-22.04 + runs-on: buildjet-2vcpu-ubuntu-2204 container: image: "fedora:latest" @@ -161,4 +161,4 @@ jobs: - uses: actions/upload-artifact@v3 with: name: Logs (clang-include-cleaner) - path: ./*.log \ No newline at end of file + path: ./*.log diff --git a/.github/workflows/scriptcheck.yml b/.github/workflows/scriptcheck.yml index 6ef6d90ee4c..8cac33efc51 100644 --- a/.github/workflows/scriptcheck.yml +++ b/.github/workflows/scriptcheck.yml @@ -11,7 +11,7 @@ jobs: build: # 'ubuntu-22.04' removes Python 2.7, 3.6 and 3.6 so keep the previous LTS version - runs-on: ubuntu-20.04 + runs-on: buildjet-2vcpu-ubuntu-2004 steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/selfcheck.yml b/.github/workflows/selfcheck.yml index 8cd028f9af9..4ed7e3aaedb 100644 --- a/.github/workflows/selfcheck.yml +++ b/.github/workflows/selfcheck.yml @@ -10,7 +10,7 @@ permissions: jobs: build: - runs-on: ubuntu-22.04 + runs-on: buildjet-2vcpu-ubuntu-2204 env: QT_VERSION: 5.15.2 diff --git a/.github/workflows/tsan.yml b/.github/workflows/tsan.yml index 876e1976141..c695cb09a0c 100644 --- a/.github/workflows/tsan.yml +++ b/.github/workflows/tsan.yml @@ -10,7 +10,7 @@ permissions: jobs: build: - runs-on: ubuntu-22.04 + runs-on: buildjet-2vcpu-ubuntu-2204 env: QT_VERSION: 5.15.2 diff --git a/.github/workflows/ubsan.yml b/.github/workflows/ubsan.yml index 2a422710b74..211af293a6e 100644 --- a/.github/workflows/ubsan.yml +++ b/.github/workflows/ubsan.yml @@ -10,7 +10,7 @@ permissions: jobs: build: - runs-on: ubuntu-22.04 + runs-on: buildjet-2vcpu-ubuntu-2204 env: QT_VERSION: 5.15.2 diff --git a/.github/workflows/valgrind.yml b/.github/workflows/valgrind.yml index 1753e6f0acd..4568128e379 100644 --- a/.github/workflows/valgrind.yml +++ b/.github/workflows/valgrind.yml @@ -10,7 +10,7 @@ permissions: jobs: build: - runs-on: ubuntu-22.04 + runs-on: buildjet-2vcpu-ubuntu-2204 steps: - uses: actions/checkout@v3 From b07024807ce3c0d289f16a27de94ff36d8756618 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Marjam=C3=A4ki?= Date: Fri, 1 Sep 2023 18:15:11 +0200 Subject: [PATCH 2/3] format.yml --- .github/workflows/format.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/format.yml b/.github/workflows/format.yml index 7c92a4a45ec..2d417576574 100644 --- a/.github/workflows/format.yml +++ b/.github/workflows/format.yml @@ -35,6 +35,7 @@ jobs: - name: Uncrustify check run: | + ls -al ~ ~/uncrustify/uncrustify -c .uncrustify.cfg -l CPP --no-backup --replace */*.cpp */*.h git diff git diff | diff - /dev/null &> /dev/null From 195a4ce1da781af1c388732357bd56653951dcd3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Marjam=C3=A4ki?= Date: Fri, 1 Sep 2023 18:26:55 +0200 Subject: [PATCH 3/3] format.yml --- .github/workflows/format.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/format.yml b/.github/workflows/format.yml index 2d417576574..aabe3c3b2a9 100644 --- a/.github/workflows/format.yml +++ b/.github/workflows/format.yml @@ -21,7 +21,7 @@ jobs: with: path: | ~/uncrustify - key: ${{ runner.os }}-uncrustify + key: buildjet-${{ runner.os }}-uncrustify - name: build uncrustify if: steps.cache-uncrustify.outputs.cache-hit != 'true'