Skip to content

Commit 2f55b5b

Browse files
committed
chore: actions
1 parent e8bd375 commit 2f55b5b

File tree

2 files changed

+15
-36
lines changed

2 files changed

+15
-36
lines changed

.github/workflows/build.yml

+3-2
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ jobs:
2929
with:
3030
submodules: true
3131

32-
- name: Install webkit2gtk (ubuntu only)
33-
if: matrix.platform == 'ubuntu-latest'
32+
- name: install dependencies (ubuntu only)
33+
if: matrix.platform == 'ubuntu-22.04' # This must match the platform value defined above.
3434
run: |
3535
sudo apt-get update
3636
sudo apt-get install -y libwebkit2gtk-4.0-dev libwebkit2gtk-4.1-dev libappindicator3-dev librsvg2-dev patchelf
@@ -72,3 +72,4 @@ jobs:
7272
APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
7373
APPLE_PASSWORD: ${{ secrets.APPLE_PASSWORD }}
7474
APPLE_PROVIDER_SHORT_NAME: ${{ secrets.APPLE_PROVIDER_SHORT_NAME }}
75+
args: ${{ matrix.args }}

.github/workflows/release.yml

+12-34
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ env:
99
CARGO_TERM_COLOR: always
1010

1111
jobs:
12-
create-release:
12+
update-changelog:
1313
runs-on: ubuntu-latest
1414
outputs:
1515
RELEASE_UPLOAD_ID: ${{ steps.create_release.outputs.id }}
@@ -31,25 +31,8 @@ jobs:
3131
version: ${{ steps.tag_name.outputs.current_version }}
3232
path: ./CHANGELOG.md
3333

34-
- name: create release
35-
id: create_release
36-
uses: ncipollo/release-action@v1
37-
env:
38-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
39-
with:
40-
# This pulls from the "Get Changelog Entry" step above, referencing it's ID to get its outputs object.
41-
# See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps
42-
tag: v${{ steps.changelog_reader.outputs.version }}
43-
name: v${{ steps.changelog_reader.outputs.version }}
44-
body: ${{ steps.changelog_reader.outputs.changes }}
45-
prerelease: ${{ steps.changelog_reader.outputs.status == 'prereleased' }}
46-
# we create first the release as draft. Will be published once everything is done
47-
draft: true
48-
allowUpdates: true
49-
token: ${{ secrets.GITHUB_TOKEN }}
50-
5134
build-tauri:
52-
needs: create-release
35+
needs: update-changelog
5336
permissions:
5437
contents: write
5538
strategy:
@@ -72,8 +55,8 @@ jobs:
7255
with:
7356
submodules: true
7457

75-
- name: Install webkit2gtk (ubuntu only)
76-
if: matrix.platform == 'ubuntu-latest'
58+
- name: install dependencies (ubuntu only)
59+
if: matrix.platform == 'ubuntu-22.04' # This must match the platform value defined above.
7760
run: |
7861
sudo apt-get update
7962
sudo apt-get install -y libwebkit2gtk-4.0-dev libwebkit2gtk-4.1-dev libappindicator3-dev librsvg2-dev patchelf
@@ -93,9 +76,9 @@ jobs:
9376
# Those targets are only used on macos runners so it's in an `if` to slightly speed up windows and linux builds.
9477
targets: ${{ matrix.platform == 'macos-latest' && 'aarch64-apple-darwin,x86_64-apple-darwin' || '' }}
9578

96-
- uses: Swatinem/rust-cache@v2
79+
- uses: Swatinem/rust-cache@v1
9780
with:
98-
workspaces: "src-tauri -> target"
81+
working-directory: "src-tauri"
9982

10083
- name: Install deps
10184
uses: bahmutov/npm-install@v1
@@ -116,14 +99,9 @@ jobs:
11699
APPLE_PASSWORD: ${{ secrets.APPLE_PASSWORD }}
117100
APPLE_PROVIDER_SHORT_NAME: ${{ secrets.APPLE_PROVIDER_SHORT_NAME }}
118101
with:
119-
releaseId: ${{ needs.create-release.outputs.RELEASE_UPLOAD_ID }}
120-
update-release:
121-
runs-on: ubuntu-latest
122-
needs: [create-release, build-tauri]
123-
steps:
124-
- name: Update release
125-
uses: irongut/[email protected]
126-
with:
127-
token: ${{ secrets.GITHUB_TOKEN }}
128-
id: ${{ needs.create-release.outputs.RELEASE_UPLOAD_ID }}
129-
draft: false
102+
args: ${{ matrix.args }}
103+
tagName: v${{ steps.changelog_reader.outputs.version }}
104+
releaseName: v${{ steps.changelog_reader.outputs.version }}
105+
releaseBody: ${{ steps.changelog_reader.outputs.changes }}
106+
releaseDraft: true
107+
prerelease: ${{ steps.changelog_reader.outputs.status == 'prereleased' }}

0 commit comments

Comments
 (0)