Skip to content

Commit

Permalink
ci: add macos-14
Browse files Browse the repository at this point in the history
  • Loading branch information
feng19 committed Jan 31, 2024
1 parent a4b6815 commit 327eec0
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 10 deletions.
20 changes: 11 additions & 9 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src-tauri/tauri.conf.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
},
"package": {
"productName": "phx_new_desktop",
"version": "0.0.0"
"version": "0.1.1"
},
"tauri": {
"allowlist": {
Expand Down

0 comments on commit 327eec0

Please sign in to comment.