From b0ef60dd8cb6209fd703e33140d1969ebb45783d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=8BAndrzej=20Ressel?= Date: Sun, 29 Sep 2024 19:37:03 +0200 Subject: [PATCH] Hardcode CI machines (#425) --- .github/workflows/build.yml | 4 ++-- .github/workflows/cleancache.yaml | 2 +- .github/workflows/deploy.yaml | 22 +++++++++++----------- .github/workflows/docs.yml | 2 +- .github/workflows/rust-clippy.yml | 2 +- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 35b7a0fb..625553fa 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -24,7 +24,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-latest, windows-latest, macos-latest] + os: [ubuntu-24.04, windows-2022, macos-14] env: RUST_BACKTRACE: "full" @@ -119,7 +119,7 @@ jobs: pulumi_wasm_generator_lib/tests/**/target/cargo-timings/cargo-timing-*.html deploy: - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 needs: build if: success() && github.ref == 'refs/heads/main' env: diff --git a/.github/workflows/cleancache.yaml b/.github/workflows/cleancache.yaml index fab7e12f..ed0e654b 100644 --- a/.github/workflows/cleancache.yaml +++ b/.github/workflows/cleancache.yaml @@ -10,7 +10,7 @@ permissions: jobs: build: - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 steps: - run: gh cache delete --all -R $GITHUB_REPOSITORY env: diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml index a8c08064..59358996 100644 --- a/.github/workflows/deploy.yaml +++ b/.github/workflows/deploy.yaml @@ -15,7 +15,7 @@ permissions: jobs: deploy_rust_registry: - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 steps: - name: Cleanup unused stuff @@ -56,7 +56,7 @@ jobs: deploy_wasm_files: - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 steps: - name: Cleanup unused stuff @@ -143,7 +143,7 @@ jobs: target/wasm32-wasip1/debug/*-debug.wasm deploy_language_plugin: - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 steps: - name: Write release version @@ -184,13 +184,13 @@ jobs: matrix: include: - rust-target: x86_64-unknown-linux-gnu - os: ubuntu-latest + os: ubuntu-24.04 - rust-target: x86_64-apple-darwin - os: macos-latest + os: macos-14 - rust-target: aarch64-apple-darwin - os: macos-latest + os: macos-14 - rust-target: x86_64-pc-windows-msvc - os: windows-latest + os: windows-2022 steps: - name: Cleanup unused stuff @@ -215,13 +215,13 @@ jobs: - run: git config --system core.longpaths true if: runner.os == 'Windows' - name: Write release version (non-Windows) - if: matrix.os != 'windows-latest' + if: matrix.os != 'windows-2022' run: | VERSION=${GITHUB_REF_NAME#v} echo "Version: $VERSION" echo "VERSION=$VERSION" >> $GITHUB_ENV - name: Write release version (Windows) - if: matrix.os == 'windows-latest' + if: matrix.os == 'windows-2022' run: | $VERSION = $env:GITHUB_REF_NAME -replace "^v" echo "Version: $VERSION" @@ -266,12 +266,12 @@ jobs: cp ./target/${{ matrix.rust-target }}/debug/pulumi_wasm_runner.exe ./target/${{ matrix.rust-target }}/debug/pulumi_wasm_runner-${{ matrix.rust-target }}-debug cp ./target/${{ matrix.rust-target }}/release/pulumi_wasm_runner.exe ./target/${{ matrix.rust-target }}/release/pulumi_wasm_runner-${{ matrix.rust-target }} cp ./target/${{ matrix.rust-target }}/release/pulumi_wasm_runner.exe ./target/${{ matrix.rust-target }}/release/pulumi_wasm_runner-${{ matrix.rust-target }}-release - if: matrix.os == 'windows-latest' + if: matrix.os == 'windows-2022' - run: | cp ./target/${{ matrix.rust-target }}/debug/pulumi_wasm_runner ./target/${{ matrix.rust-target }}/debug/pulumi_wasm_runner-${{ matrix.rust-target }}-debug cp ./target/${{ matrix.rust-target }}/release/pulumi_wasm_runner ./target/${{ matrix.rust-target }}/release/pulumi_wasm_runner-${{ matrix.rust-target }} cp ./target/${{ matrix.rust-target }}/release/pulumi_wasm_runner ./target/${{ matrix.rust-target }}/release/pulumi_wasm_runner-${{ matrix.rust-target }}-release - if: matrix.os != 'windows-latest' + if: matrix.os != 'windows-2022' - name: Release uses: softprops/action-gh-release@v2.0.8 diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 391e5151..3c148fc4 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -20,7 +20,7 @@ jobs: environment: name: github-pages url: ${{ steps.deployment.outputs.page_url }} - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 steps: - name: Checkout uses: actions/checkout@v4 diff --git a/.github/workflows/rust-clippy.yml b/.github/workflows/rust-clippy.yml index 95b85833..270e15e3 100644 --- a/.github/workflows/rust-clippy.yml +++ b/.github/workflows/rust-clippy.yml @@ -25,7 +25,7 @@ concurrency: jobs: rust-clippy-analyze: name: Run rust-clippy analyzing - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 permissions: contents: read security-events: write