From a9c634f06d0fec7988dc45d50a900f5d35aa3dac Mon Sep 17 00:00:00 2001 From: Robert Adam Date: Sat, 6 Jul 2024 14:27:47 +0200 Subject: [PATCH 1/6] MAINT(ci): Complete upgrade to macOS 12 on Azure Pipelines In a15aa1e7a6699b2ec14a9e89046cdfb66140911c only the workflow for the main branch was edited, but the spec for the PR runs was left unchanged. --- .ci/azure-pipelines/main-pr.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci/azure-pipelines/main-pr.yml b/.ci/azure-pipelines/main-pr.yml index e64a78c126c..848c8f54258 100644 --- a/.ci/azure-pipelines/main-pr.yml +++ b/.ci/azure-pipelines/main-pr.yml @@ -43,7 +43,7 @@ jobs: workspace: clean: all pool: - vmImage: 'macOS-11' + vmImage: 'macOS-12' variables: MUMBLE_ENVIRONMENT_VERSION: 'mumble_env.x64-osx-release.2023-12-31.6a3ce9c65' MUMBLE_ENVIRONMENT_TRIPLET: 'x64-osx-release' From d1be065d08a2e2a1b2992510a9a64c39e8fe9a88 Mon Sep 17 00:00:00 2001 From: Robert Adam Date: Sat, 6 Jul 2024 14:29:46 +0200 Subject: [PATCH 2/6] MAINT(ci): Upgrade to Ubuntu 22.04 on Azure Pipelines For the previously used Ubuntu 20.04, it is only a matter of time until they remove this VM image. --- .../install-environment_linux.bash | 36 ++++++++++++++----- .ci/azure-pipelines/main-pr.yml | 2 +- .ci/azure-pipelines/main.yml | 2 +- 3 files changed, 30 insertions(+), 10 deletions(-) diff --git a/.ci/azure-pipelines/install-environment_linux.bash b/.ci/azure-pipelines/install-environment_linux.bash index 5cf71c0c093..db449953b31 100755 --- a/.ci/azure-pipelines/install-environment_linux.bash +++ b/.ci/azure-pipelines/install-environment_linux.bash @@ -7,11 +7,31 @@ sudo apt-get update -sudo apt-get -y install build-essential g++-multilib ninja-build pkg-config \ - qt5-default qttools5-dev qttools5-dev-tools libqt5svg5-dev \ - libboost-dev libssl-dev libprotobuf-dev protobuf-compiler libprotoc-dev \ - libcap-dev libxi-dev \ - libasound2-dev libasound2-plugins libasound2-plugins-extra\ - libogg-dev libsndfile1-dev libopus-dev libspeechd-dev \ - libavahi-compat-libdnssd-dev libzeroc-ice-dev \ - zsync appstream libpoco-dev +sudo apt -y install \ + build-essential \ + g++-multilib \ + ninja-build \ + pkg-config \ + qtbase5-dev \ + qttools5-dev \ + qttools5-dev-tools \ + libqt5svg5-dev \ + libboost-dev \ + libssl-dev \ + libprotobuf-dev \ + protobuf-compiler \ + libprotoc-dev \ + libcap-dev \ + libxi-dev \ + libasound2-dev \ + libasound2-plugins \ + libasound2-plugins-extra \ + libogg-dev \ + libsndfile1-dev \ + libopus-dev \ + libspeechd-dev \ + libavahi-compat-libdnssd-dev \ + libzeroc-ice-dev \ + zsync \ + appstream \ + libpoco-dev diff --git a/.ci/azure-pipelines/main-pr.yml b/.ci/azure-pipelines/main-pr.yml index 848c8f54258..85b7ac46b21 100644 --- a/.ci/azure-pipelines/main-pr.yml +++ b/.ci/azure-pipelines/main-pr.yml @@ -35,7 +35,7 @@ jobs: workspace: clean: all pool: - vmImage: 'ubuntu-20.04' + vmImage: 'ubuntu-22.04' steps: - template: steps_linux.yml diff --git a/.ci/azure-pipelines/main.yml b/.ci/azure-pipelines/main.yml index 219c20cebec..79b8f455a93 100644 --- a/.ci/azure-pipelines/main.yml +++ b/.ci/azure-pipelines/main.yml @@ -33,7 +33,7 @@ jobs: workspace: clean: all pool: - vmImage: 'ubuntu-20.04' + vmImage: 'ubuntu-22.04' steps: - template: steps_linux.yml From 991e5f242daef9c121ce274fd76a2ef79fcf9eaa Mon Sep 17 00:00:00 2001 From: Robert Adam Date: Sat, 6 Jul 2024 14:34:56 +0200 Subject: [PATCH 3/6] MAINT(ci): Access current OS via variable --- .github/workflows/code-ql.yml | 8 ++++++-- .github/workflows/pr-checks.yml | 8 ++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/.github/workflows/code-ql.yml b/.github/workflows/code-ql.yml index fa32953cc8a..5464c37e76b 100644 --- a/.github/workflows/code-ql.yml +++ b/.github/workflows/code-ql.yml @@ -24,7 +24,11 @@ jobs: needs: pre_run if: needs.pre_run.outputs.should_skip != 'true' - runs-on: ubuntu-latest + strategy: + matrix: + os: [ubuntu-latest] + + runs-on: ${{ matrix.os }} permissions: security-events: write @@ -45,7 +49,7 @@ jobs: - uses: ./.github/actions/install-dependencies with: type: shared - os: ubuntu-20.04 + os: ${{ matrix.os }} arch: 64bit - name: Create build dir diff --git a/.github/workflows/pr-checks.yml b/.github/workflows/pr-checks.yml index deef6d06b88..fc900be447a 100644 --- a/.github/workflows/pr-checks.yml +++ b/.github/workflows/pr-checks.yml @@ -4,7 +4,11 @@ on: [pull_request] jobs: pr-checks: - runs-on: ubuntu-20.04 + strategy: + matrix: + os: [ubuntu-latest] + + runs-on: ${{ matrix.os }} steps: @@ -32,7 +36,7 @@ jobs: - uses: ./.github/actions/install-dependencies with: type: shared - os: ubuntu-20.04 + os: ${{ matrix.os }} arch: 64bit - name: Generate compile-command DB From 6c0af79ebe36ef6d009a788619b96cd0ff5f04aa Mon Sep 17 00:00:00 2001 From: Robert Adam Date: Sat, 6 Jul 2024 14:35:58 +0200 Subject: [PATCH 4/6] MAINT(ci): Upgrade from Ubuntu 20.04 to newer Ubuntu version --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f405d32123f..79206c8b816 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -46,7 +46,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-20.04, ubuntu-22.04] + os: [ubuntu-22.04, ubuntu-24.04] type: [shared] # Currently the "static" build doesn't work for Linux systems arch: [64bit] From 1048e9c843646ea53efdbb8c4006bee3539295f3 Mon Sep 17 00:00:00 2001 From: Robert Adam Date: Sat, 6 Jul 2024 14:39:36 +0200 Subject: [PATCH 5/6] MAINT(ci): Don't require two backport labels --- .github/workflows/backport.yml | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml index 52adfe6bdc6..b241dda776a 100644 --- a/.github/workflows/backport.yml +++ b/.github/workflows/backport.yml @@ -8,16 +8,9 @@ jobs: backport: name: Backport PR runs-on: ubuntu-latest - if: | - github.event.pull_request.merged == true - && contains(github.event.pull_request.labels.*.name, 'backport-needed') - && ( - (github.event.action == 'labeled' && github.event.label.name == 'backport-needed') - || (github.event.action == 'closed') - ) steps: - name: Backport Action - uses: sqren/backport-github-action@v8.9.3 + uses: sqren/backport-github-action@v9.5.1 with: github_token: ${{ secrets.BACKPORT_TOKEN }} auto_backport_label_prefix: auto-backport-to- From b4796a96c36c3911b81703bef49823453e3e38b9 Mon Sep 17 00:00:00 2001 From: Robert Adam Date: Sat, 6 Jul 2024 14:47:02 +0200 Subject: [PATCH 6/6] MAINT(ci): Update all GitHub actions to latest versions --- .github/workflows/backport.yml | 2 +- .github/workflows/code-ql.yml | 6 +++--- .github/workflows/pr-checks.yml | 6 +++--- .github/workflows/release_dispatch.yml | 2 +- .github/workflows/stale_issues.yml | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml index b241dda776a..efbe303b744 100644 --- a/.github/workflows/backport.yml +++ b/.github/workflows/backport.yml @@ -10,7 +10,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Backport Action - uses: sqren/backport-github-action@v9.5.1 + uses: sorenlouv/backport-github-action@v9.5.1 with: github_token: ${{ secrets.BACKPORT_TOKEN }} auto_backport_label_prefix: auto-backport-to- diff --git a/.github/workflows/code-ql.yml b/.github/workflows/code-ql.yml index 5464c37e76b..62eb2863679 100644 --- a/.github/workflows/code-ql.yml +++ b/.github/workflows/code-ql.yml @@ -36,13 +36,13 @@ jobs: contents: read steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: submodules: 'recursive' # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@v2 + uses: github/codeql-action/init@v3 with: languages: python, cpp @@ -66,4 +66,4 @@ jobs: shell: bash - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v2 + uses: github/codeql-action/analyze@v3 diff --git a/.github/workflows/pr-checks.yml b/.github/workflows/pr-checks.yml index fc900be447a..3b940f5f7ee 100644 --- a/.github/workflows/pr-checks.yml +++ b/.github/workflows/pr-checks.yml @@ -16,7 +16,7 @@ jobs: run: sudo apt install python3 shell: bash - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: # Assume that there are not >200 new commits that need checking fetch-depth: 200 @@ -44,8 +44,8 @@ jobs: shell: bash - name: Check code formatting - uses: jidicula/clang-format-action@v3.5.2 + uses: jidicula/clang-format-action@v4.13.0 with: clang-format-version: '10' check-path: '.' - exclude-regex: '(3rdparty/*|build/*)' + exclude-regex: '(\\.git/.*|3rdparty/.*|build/.*|.*proto$)' diff --git a/.github/workflows/release_dispatch.yml b/.github/workflows/release_dispatch.yml index b55caeeb7c7..e31e313e94b 100644 --- a/.github/workflows/release_dispatch.yml +++ b/.github/workflows/release_dispatch.yml @@ -9,7 +9,7 @@ jobs: runs-on: ubuntu-latest steps: - name: "Dispatch release to mumble-docker repo" - uses: peter-evans/repository-dispatch@v2 + uses: peter-evans/repository-dispatch@v3 with: token: ${{ secrets.DOCKER_REPO_ACCCESS_TOKEN }} event-type: new_release diff --git a/.github/workflows/stale_issues.yml b/.github/workflows/stale_issues.yml index e864dc7711f..41559a17c11 100644 --- a/.github/workflows/stale_issues.yml +++ b/.github/workflows/stale_issues.yml @@ -11,7 +11,7 @@ jobs: permissions: issues: write steps: - - uses: actions/stale@v5 + - uses: actions/stale@v9 with: days-before-issue-stale: 14 days-before-issue-close: 7 @@ -31,7 +31,7 @@ jobs: permissions: issues: write steps: - - uses: actions/stale@v5 + - uses: actions/stale@v9 with: days-before-issue-stale: 4 days-before-issue-close: 3