Skip to content

Commit 23328fa

Browse files
committed
The fight with GH actions continues
1 parent 45ad8b0 commit 23328fa

File tree

2 files changed

+28
-30
lines changed

2 files changed

+28
-30
lines changed

.github/workflows/edge.yml

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@ jobs:
1010
runs-on: ubuntu-latest
1111
steps:
1212
- name: Setup repo
13-
uses: actions/checkout@v3
13+
uses: actions/checkout@v4
1414
- name: Setup Node.js
1515
uses: actions/setup-node@v4
1616
with:
1717
node-version-file: '.nvmrc'
1818
- name: Setup Go
19-
uses: actions/setup-go@v4
19+
uses: actions/setup-go@v5
2020
with:
2121
go-version: "1.25.1"
2222
- name: Install dependencies
@@ -31,25 +31,24 @@ jobs:
3131
make build-cli-releases
3232
3333
- name: Upload macOS binaries for signing
34-
uses: actions/upload-artifact@v4
34+
uses: actions/upload-artifact@v5
3535
with:
3636
name: macos-unsigned
3737
path: |
3838
silverbullet-server-darwin-*.zip
3939
silverbullet-cli-darwin-*.zip
4040
retention-days: 1
4141

42+
- name: Remove macOS zips before uploading non-macOS binaries
43+
run: rm -f silverbullet-*-darwin-*.zip
44+
4245
- name: Upload non-macOS binaries
43-
uses: actions/upload-artifact@v4
46+
uses: actions/upload-artifact@v5
4447
with:
4548
name: other-binaries
4649
path: |
47-
silverbullet-server-linux-*.zip
48-
silverbullet-server-windows-*.zip
49-
silverbullet-server-freebsd-*.zip
50-
silverbullet-cli-linux-*.zip
51-
silverbullet-cli-windows-*.zip
52-
silverbullet-cli-freebsd-*.zip
50+
silverbullet-*.zip
51+
silverbullet-cli-*.zip
5352
website/CHANGELOG.md
5453
dist/plug-compile.js
5554
retention-days: 1
@@ -59,7 +58,7 @@ jobs:
5958
runs-on: macos-latest
6059
steps:
6160
- name: Download unsigned macOS binaries
62-
uses: actions/download-artifact@v4
61+
uses: actions/download-artifact@v5
6362
with:
6463
name: macos-unsigned
6564

@@ -136,7 +135,7 @@ jobs:
136135
rm -rf ~/private_keys
137136
138137
- name: Upload signed macOS binaries
139-
uses: actions/upload-artifact@v4
138+
uses: actions/upload-artifact@v5
140139
with:
141140
name: macos-signed
142141
path: |
@@ -152,17 +151,17 @@ jobs:
152151
runs-on: ubuntu-latest
153152
steps:
154153
- name: Download signed macOS binaries
155-
uses: actions/download-artifact@v4
154+
uses: actions/download-artifact@v5
156155
with:
157156
name: macos-signed
158157

159158
- name: Download other binaries
160-
uses: actions/download-artifact@v4
159+
uses: actions/download-artifact@v5
161160
with:
162161
name: other-binaries
163162

164163
- name: Update edge release
165-
uses: softprops/action-gh-release@v1
164+
uses: softprops/action-gh-release@v2
166165
env:
167166
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
168167
with:

.github/workflows/server.yml

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@ jobs:
1010
runs-on: ubuntu-latest
1111
steps:
1212
- name: Setup repo
13-
uses: actions/checkout@v3
13+
uses: actions/checkout@v4
1414
- name: Setup Node.js
1515
uses: actions/setup-node@v4
1616
with:
1717
node-version-file: '.nvmrc'
1818
- name: Setup Go
19-
uses: actions/setup-go@v4
19+
uses: actions/setup-go@v5
2020
with:
2121
go-version: "1.25.1"
2222
- name: Install dependencies
@@ -31,25 +31,24 @@ jobs:
3131
make build-cli-releases
3232
3333
- name: Upload macOS binaries for signing
34-
uses: actions/upload-artifact@v4
34+
uses: actions/upload-artifact@v5
3535
with:
3636
name: macos-unsigned
3737
path: |
3838
silverbullet-server-darwin-*.zip
3939
silverbullet-cli-darwin-*.zip
4040
retention-days: 1
4141

42+
- name: Remove macOS zips before uploading non-macOS binaries
43+
run: rm -f silverbullet-*-darwin-*.zip
44+
4245
- name: Upload non-macOS binaries
43-
uses: actions/upload-artifact@v4
46+
uses: actions/upload-artifact@v5
4447
with:
4548
name: other-binaries
4649
path: |
47-
silverbullet-server-linux-*.zip
48-
silverbullet-server-windows-*.zip
49-
silverbullet-server-freebsd-*.zip
50-
silverbullet-cli-linux-*.zip
51-
silverbullet-cli-windows-*.zip
52-
silverbullet-cli-freebsd-*.zip
50+
silverbullet-*.zip
51+
silverbullet-cli-*.zip
5352
dist/plug-compile.js
5453
retention-days: 1
5554

@@ -58,7 +57,7 @@ jobs:
5857
runs-on: macos-latest
5958
steps:
6059
- name: Download unsigned macOS binaries
61-
uses: actions/download-artifact@v4
60+
uses: actions/download-artifact@v5
6261
with:
6362
name: macos-unsigned
6463

@@ -135,7 +134,7 @@ jobs:
135134
rm -rf ~/private_keys
136135
137136
- name: Upload signed macOS binaries
138-
uses: actions/upload-artifact@v4
137+
uses: actions/upload-artifact@v5
139138
with:
140139
name: macos-signed
141140
path: |
@@ -151,17 +150,17 @@ jobs:
151150
runs-on: ubuntu-latest
152151
steps:
153152
- name: Download signed macOS binaries
154-
uses: actions/download-artifact@v4
153+
uses: actions/download-artifact@v5
155154
with:
156155
name: macos-signed
157156

158157
- name: Download other binaries
159-
uses: actions/download-artifact@v4
158+
uses: actions/download-artifact@v5
160159
with:
161160
name: other-binaries
162161

163162
- name: Release
164-
uses: softprops/action-gh-release@v1
163+
uses: softprops/action-gh-release@v2
165164
env:
166165
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
167166
with:

0 commit comments

Comments
 (0)