diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index 738ae32f12..9204a1c175 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -53,9 +53,9 @@ jobs: matrix: # We build a dynamic-linked linux binary because otherwise HSM support fails with: # Error: IO: Dynamic loading not supported - os: [macos-12, ubuntu-20.04, ubuntu-22.04, windows-2022] + os: [macos-13-large, ubuntu-20.04, ubuntu-22.04, windows-2022] include: - - os: macos-12 + - os: macos-13-large target: x86_64-apple-darwin binary_path: target/x86_64-apple-darwin/release/dfx - os: ubuntu-20.04 @@ -109,7 +109,7 @@ jobs: strategy: fail-fast: false matrix: - os: [macos-12, ubuntu-20.04, ubuntu-22.04] + os: [macos-13-large, ubuntu-20.04, ubuntu-22.04] steps: - uses: actions/checkout@v4 - name: Download dfx binary @@ -182,7 +182,7 @@ jobs: strategy: fail-fast: false matrix: - os: [macos-12, ubuntu-20.04, ubuntu-22.04] + os: [macos-13-large, ubuntu-20.04, ubuntu-22.04] steps: - name: Checking out repo uses: actions/checkout@v4 diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 06c4dbba6a..25a2c23b2b 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -41,7 +41,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ ubuntu-latest, macos-12, windows-latest ] + os: [ ubuntu-latest, macos-13-large, windows-latest ] steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/prepare-dfx-assets.yml b/.github/workflows/prepare-dfx-assets.yml index 73a7aa4171..52a768be7a 100644 --- a/.github/workflows/prepare-dfx-assets.yml +++ b/.github/workflows/prepare-dfx-assets.yml @@ -24,7 +24,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ ubuntu-latest, macos-12 ] + os: [ ubuntu-latest, macos-13-large ] steps: - uses: actions/checkout@v4 - uses: actions/cache@v4 diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 3b235fc519..e95094effb 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -31,7 +31,7 @@ jobs: # Error: IO: Dynamic loading not supported target: [ x86_64-apple-darwin, x86_64-unknown-linux-gnu ] include: - - os: macos-12 + - os: macos-13-large target: x86_64-apple-darwin binary_path: target/x86_64-apple-darwin/release name: x86_64-darwin diff --git a/.github/workflows/unit.yml b/.github/workflows/unit.yml index 22ee0a7f90..18b6987b41 100644 --- a/.github/workflows/unit.yml +++ b/.github/workflows/unit.yml @@ -43,7 +43,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ ubuntu-latest, macos-12 ] + os: [ ubuntu-latest, macos-13-large ] steps: - uses: actions/checkout@v4 - uses: actions/cache@v4 diff --git a/scripts/workflows/e2e-matrix.py b/scripts/workflows/e2e-matrix.py index f65d6a832d..c48f831211 100755 --- a/scripts/workflows/e2e-matrix.py +++ b/scripts/workflows/e2e-matrix.py @@ -16,7 +16,7 @@ def test_scripts(prefix): matrix = { "test": test, "backend": ["pocketic", "replica"], - "os": ["macos-12", "ubuntu-20.04"], + "os": ["macos-13-large", "ubuntu-20.04"], "exclude": [ { "backend": "pocketic", diff --git a/scripts/workflows/provision-darwin.sh b/scripts/workflows/provision-darwin.sh index c85ea49273..279c4cc1b1 100755 --- a/scripts/workflows/provision-darwin.sh +++ b/scripts/workflows/provision-darwin.sh @@ -20,7 +20,7 @@ if [ "$E2E_TEST" = "tests-dfx/bitcoin.bash" ]; then brew fetch --retry bitcoin brew install bitcoin fi -if [ "$E2E_TEST" = "tests-dfx/build_rust.bash" ]; then +if [ "$E2E_TEST" = "tests-dfx/build_rust.bash" ] && command -v cargo-audit &>/dev/null; then cargo uninstall cargo-audit fi if [ "$E2E_TEST" = "tests-dfx/certificate.bash" ]; then