From 1320dbda4655aed01d1c9e2b7876eb5fcca4b9bf Mon Sep 17 00:00:00 2001 From: Julian Braha Date: Tue, 13 Feb 2024 21:25:53 +0000 Subject: [PATCH] Use Apple Silicon runner for release, clippy, and cache factory workflows (#2035) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Change release workflow to use apple silicon runner * Use apple silicon runner for clippy and cache factory * Update release and cache-factory to macos-14 and part of CI to ubuntu-latest * Revert to ubuntu-latest for creating a release --------- Co-authored-by: VĂ­tor Vasconcellos --- .github/workflows/cache-factory.yaml | 6 +++--- .github/workflows/ci.yml | 8 ++++---- .github/workflows/release.yml | 4 ++-- .github/workflows/server.yml | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/cache-factory.yaml b/.github/workflows/cache-factory.yaml index 2d182177f..35b1ccf79 100644 --- a/.github/workflows/cache-factory.yaml +++ b/.github/workflows/cache-factory.yaml @@ -21,9 +21,9 @@ jobs: fail-fast: true matrix: settings: - - host: macos-latest + - host: macos-14 target: x86_64-apple-darwin - - host: macos-latest + - host: macos-14 target: aarch64-apple-darwin - host: windows-latest target: x86_64-pc-windows-msvc @@ -46,7 +46,7 @@ jobs: if: ${{ runner.os == 'Linux' }} uses: easimon/maximize-build-space@master with: - swap-size-mb: 3072 + swap-size-mb: 4096 root-reserve-mb: 6144 remove-dotnet: 'true' remove-codeql: 'true' diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 61d0362be..0d754dc47 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,7 +15,7 @@ concurrency: jobs: typescript: name: TypeScript - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest steps: - name: Checkout repository uses: actions/checkout@v3 @@ -30,7 +30,7 @@ jobs: eslint: name: ESLint - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest steps: - name: Checkout repository uses: actions/checkout@v3 @@ -45,7 +45,7 @@ jobs: rustfmt: name: Rust Formatting - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest steps: - name: Maximize build space if: ${{ runner.os == 'Linux' }} @@ -97,7 +97,7 @@ jobs: runs-on: ${{ matrix.platform }} strategy: matrix: - platform: [ubuntu-20.04, macos-latest, windows-latest] + platform: [ubuntu-20.04, macos-14, windows-latest] steps: - name: Maximize build space if: ${{ runner.os == 'Linux' }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 09cc78d98..319ccc062 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -9,12 +9,12 @@ jobs: strategy: matrix: settings: - - host: macos-latest + - host: macos-14 target: x86_64-apple-darwin bundles: app,dmg os: darwin arch: x86_64 - - host: macos-latest + - host: macos-14 target: aarch64-apple-darwin bundles: app,dmg os: darwin diff --git a/.github/workflows/server.yml b/.github/workflows/server.yml index 33630a9f5..c0f191bc4 100644 --- a/.github/workflows/server.yml +++ b/.github/workflows/server.yml @@ -8,7 +8,7 @@ on: jobs: build-server: name: Build a docker image for spacedrive server - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest defaults: run: shell: bash