Skip to content

Commit e9fc9ce

Browse files
authored
Merge pull request #45 from dbidwell94/tauri-2
Migrate to tauri 2.0
2 parents 255909e + 4787fea commit e9fc9ce

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+17763
-5315
lines changed

.github/workflows/publish.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66

77
jobs:
88
create-release:
9-
runs-on: ubuntu-20.04
9+
runs-on: ubuntu-22.04
1010
outputs:
1111
release_id: ${{ steps.create-release.outputs.result }}
1212

@@ -15,7 +15,7 @@ jobs:
1515
- name: setup node
1616
uses: actions/setup-node@v1
1717
with:
18-
node-version: 16
18+
node-version: 20
1919
- name: get version
2020
run: echo "PACKAGE_VERSION=$(node -p "require('./package.json').version")" >> $GITHUB_ENV
2121
- name: create release
@@ -40,24 +40,24 @@ jobs:
4040
strategy:
4141
fail-fast: false
4242
matrix:
43-
platform: [macos-latest, ubuntu-20.04, windows-latest]
43+
platform: [macos-latest, ubuntu-22.04, windows-latest]
4444

4545
runs-on: ${{ matrix.platform }}
4646
steps:
4747
- uses: actions/checkout@v2
4848
- name: setup node
4949
uses: actions/setup-node@v1
5050
with:
51-
node-version: 16
51+
node-version: 20
5252
- name: install Rust stable
5353
uses: actions-rs/toolchain@v1
5454
with:
5555
toolchain: stable
5656
- name: install dependencies (ubuntu only)
57-
if: matrix.platform == 'ubuntu-20.04'
57+
if: matrix.platform == 'ubuntu-22.04'
5858
run: |
5959
sudo apt-get update
60-
sudo apt-get install -y libgtk-3-dev webkit2gtk-4.0 libappindicator3-dev librsvg2-dev patchelf
60+
sudo apt-get install -y libwebkit2gtk-4.1-dev libappindicator3-dev librsvg2-dev patchelf
6161
- name: install app dependencies and build it
6262
run: npm ci && npm run build
6363
- uses: tauri-apps/tauri-action@v0
@@ -67,7 +67,7 @@ jobs:
6767
releaseId: ${{ needs.create-release.outputs.release_id }}
6868

6969
publish-release:
70-
runs-on: ubuntu-20.04
70+
runs-on: ubuntu-22.04
7171
needs: [ create-release, build-tauri ]
7272

7373
steps:

.github/workflows/test.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,24 +6,24 @@ jobs:
66
strategy:
77
fail-fast: false
88
matrix:
9-
platform: [ubuntu-20.04]
9+
platform: [ubuntu-22.04]
1010

1111
runs-on: ${{ matrix.platform }}
1212
steps:
1313
- uses: actions/checkout@v2
1414
- name: setup node
1515
uses: actions/setup-node@v1
1616
with:
17-
node-version: 16
17+
node-version: 20
1818
- name: install Rust stable
1919
uses: actions-rs/toolchain@v1
2020
with:
2121
toolchain: stable
2222
- name: install dependencies (ubuntu only)
23-
if: matrix.platform == 'ubuntu-20.04'
23+
if: matrix.platform == 'ubuntu-22.04'
2424
run: |
2525
sudo apt-get update
26-
sudo apt-get install -y libgtk-3-dev webkit2gtk-4.0 libappindicator3-dev librsvg2-dev patchelf
26+
sudo apt-get install -y libwebkit2gtk-4.1-dev libappindicator3-dev librsvg2-dev patchelf
2727
- name: install app dependencies and build it
2828
run: npm ci && npm run build && npm test
2929
- name: Test Tauri app

0 commit comments

Comments
 (0)