From 7225ed48dd94240af9f3bff05d216053ae446fca Mon Sep 17 00:00:00 2001 From: David Baker Date: Mon, 14 Oct 2024 12:48:38 +0100 Subject: [PATCH] Pin GHA to ubuntu 22 while we work out why 24 fails --- .github/workflows/backport.yml | 2 +- .github/workflows/build_and_deploy.yaml | 4 ++-- .github/workflows/build_and_test.yaml | 4 ++-- .github/workflows/build_linux.yaml | 4 ++-- .github/workflows/build_prepare.yaml | 2 +- .github/workflows/dockerbuild.yaml | 2 +- .github/workflows/release.yml | 2 +- .github/workflows/static_analysis.yaml | 8 ++++---- .github/workflows/triage-incoming.yml | 2 +- 9 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml index dd793898ec..01dfbe4e6d 100644 --- a/.github/workflows/backport.yml +++ b/.github/workflows/backport.yml @@ -10,7 +10,7 @@ on: jobs: backport: name: Backport - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 # Only react to merged PRs for security reasons. # See https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#pull_request_target. if: > diff --git a/.github/workflows/build_and_deploy.yaml b/.github/workflows/build_and_deploy.yaml index 2343951352..02a4df04e6 100644 --- a/.github/workflows/build_and_deploy.yaml +++ b/.github/workflows/build_and_deploy.yaml @@ -99,7 +99,7 @@ jobs: - macos - linux - windows - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 name: ${{ needs.prepare.outputs.deploy == 'true' && 'Deploy' || 'Deploy (dry-run)' }} if: always() && !contains(needs.*.result, 'failure') && !contains(needs.*.result, 'cancelled') environment: ${{ needs.prepare.outputs.deploy == 'true' && 'packages.element.io' || '' }} @@ -252,7 +252,7 @@ jobs: deploy-ess: needs: deploy - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 name: Deploy builds to ESS if: needs.prepare.outputs.deploy == 'true' && github.event_name == 'release' env: diff --git a/.github/workflows/build_and_test.yaml b/.github/workflows/build_and_test.yaml index 47ad0e4bbd..9708b7a507 100644 --- a/.github/workflows/build_and_test.yaml +++ b/.github/workflows/build_and_test.yaml @@ -60,12 +60,12 @@ jobs: rsync -a /Volumes/Element/Element.app ~/Applications/ && hdiutil detach /Volumes/Element - name: "Linux (amd64) (sqlcipher: system)" - os: ubuntu-latest + os: ubuntu-22.04 artifact: linux-amd64-sqlcipher-system executable: "/opt/Element/element-desktop" prepare_cmd: "sudo apt-get -qq update && sudo apt install ./dist/*.deb" - name: "Linux (amd64) (sqlcipher: static)" - os: ubuntu-latest + os: ubuntu-22.04 artifact: linux-amd64-sqlcipher-static executable: "/opt/Element/element-desktop" prepare_cmd: "sudo apt-get -qq update && sudo apt install ./dist/*.deb" diff --git a/.github/workflows/build_linux.yaml b/.github/workflows/build_linux.yaml index a95a7b80da..8c1167d8ac 100644 --- a/.github/workflows/build_linux.yaml +++ b/.github/workflows/build_linux.yaml @@ -26,7 +26,7 @@ jobs: # We build the hak files on native infrastructure as matrix-seshat fails to cross-compile properly # https://github.com/matrix-org/seshat/issues/135 hak: - runs-on: ${{ inputs.arch == 'arm64' && 'dind-l-arm64' || 'ubuntu-latest' }} + runs-on: ${{ inputs.arch == 'arm64' && 'dind-l-arm64' || 'ubuntu-22.04' }} env: HAK_DOCKER_IMAGE: ghcr.io/element-hq/element-desktop-dockerbuild outputs: @@ -148,7 +148,7 @@ jobs: build: needs: hak - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/build_prepare.yaml b/.github/workflows/build_prepare.yaml index ffb727cac2..b0fca350e2 100644 --- a/.github/workflows/build_prepare.yaml +++ b/.github/workflows/build_prepare.yaml @@ -45,7 +45,7 @@ jobs: prepare: name: Prepare environment: ${{ inputs.nightly && 'packages.element.io' || '' }} - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 outputs: nightly-version: ${{ steps.versions.outputs.nightly }} steps: diff --git a/.github/workflows/dockerbuild.yaml b/.github/workflows/dockerbuild.yaml index e1e8065229..affae27b55 100644 --- a/.github/workflows/dockerbuild.yaml +++ b/.github/workflows/dockerbuild.yaml @@ -12,7 +12,7 @@ env: jobs: build: name: Docker Build - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 permissions: contents: read packages: write diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index efda150011..c81116fe49 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -26,7 +26,7 @@ jobs: check: name: Post release checks needs: release - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - name: Wait for desktop packaging uses: t3chguy/wait-on-check-action@18541021811b56544d90e0f073401c2b99e249d6 # fork diff --git a/.github/workflows/static_analysis.yaml b/.github/workflows/static_analysis.yaml index d9014f102d..92b32834ec 100644 --- a/.github/workflows/static_analysis.yaml +++ b/.github/workflows/static_analysis.yaml @@ -6,7 +6,7 @@ on: jobs: ts_lint: name: "Typescript Syntax Check" - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v4 @@ -30,7 +30,7 @@ jobs: js_lint: name: "ESLint" - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v4 @@ -48,7 +48,7 @@ jobs: workflow_lint: name: "Workflow Lint" - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v4 @@ -66,7 +66,7 @@ jobs: analyse_dead_code: name: "Analyse Dead Code" - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/triage-incoming.yml b/.github/workflows/triage-incoming.yml index 2535fbfcb9..a62c1c8cc1 100644 --- a/.github/workflows/triage-incoming.yml +++ b/.github/workflows/triage-incoming.yml @@ -6,7 +6,7 @@ on: jobs: automate-project-columns-next: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - uses: actions/add-to-project@main with: