From 327eec0586d209ba6d710d8459dfaa90f80bdc76 Mon Sep 17 00:00:00 2001 From: feng19 Date: Wed, 31 Jan 2024 10:49:49 +0800 Subject: [PATCH] ci: add macos-14 --- .github/workflows/main.yml | 20 +++++++++++--------- src-tauri/tauri.conf.json | 2 +- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 6e15292..aa4ecd8 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -37,9 +37,8 @@ jobs: strategy: fail-fast: false matrix: - platform: [ubuntu-20.04] - - runs-on: ${{ matrix.platform }} + os: [ubuntu-20.04] + runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v3 - uses: erlef/setup-beam@v1 @@ -52,21 +51,21 @@ jobs: path: | deps _build - key: ${{ runner.os }}-mix-${{ hashFiles(format('{0}{1}', github.workspace, '/mix.lock')) }} + key: ${{ matrix.os }}-mix-${{ hashFiles(format('{0}{1}', github.workspace, '/mix.lock')) }} - name: Restore rust target uses: actions/cache@v3 with: path: | src-tauri/target/release/deps src-tauri/target/release/build - key: ${{ runner.os }}-cargo-${{ hashFiles(format('{0}{1}', github.workspace, '/src-tauri/Cargo.lock')) }} + key: ${{ matrix.os }}-cargo-${{ hashFiles(format('{0}{1}', github.workspace, '/src-tauri/Cargo.lock')) }} - run: mix setup - run: mix assets.deploy - run: mix release --force --overwrite - name: install Rust stable uses: dtolnay/rust-toolchain@stable - name: install dependencies (ubuntu only) - if: matrix.platform == 'ubuntu-20.04' + if: matrix.os == 'ubuntu-20.04' run: | sudo apt-get update sudo apt-get install -y libgtk-3-dev libwebkit2gtk-4.0-dev libappindicator3-dev librsvg2-dev patchelf @@ -78,7 +77,10 @@ jobs: macos: needs: create-release - runs-on: macos-latest + strategy: + matrix: + os: [macos-13, macos-14] + runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v3 @@ -88,14 +90,14 @@ jobs: path: | deps _build - key: ${{ runner.os }}-mix-${{ hashFiles(format('{0}{1}', github.workspace, '/mix.lock')) }} + key: ${{ matrix.os }}-mix-${{ hashFiles(format('{0}{1}', github.workspace, '/mix.lock')) }} - name: Restore rust target uses: actions/cache@v3 with: path: | src-tauri/target/release/deps src-tauri/target/release/build - key: ${{ runner.os }}-cargo-${{ hashFiles(format('{0}{1}', github.workspace, '/src-tauri/Cargo.lock')) }} + key: ${{ matrix.os }}-cargo-${{ hashFiles(format('{0}{1}', github.workspace, '/src-tauri/Cargo.lock')) }} - uses: asdf-vm/actions/install@v2 env: KERL_CONFIGURE_OPTIONS: --disable-dynamic-ssl-lib diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index c54c96f..e6f5e4e 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -8,7 +8,7 @@ }, "package": { "productName": "phx_new_desktop", - "version": "0.0.0" + "version": "0.1.1" }, "tauri": { "allowlist": {