Skip to content

Commit 3dc42a3

Browse files
committed
Merge branch 'dev'
2 parents 18001fd + 021c07e commit 3dc42a3

2 files changed

Lines changed: 18 additions & 18 deletions

File tree

.github/workflows/release.yml

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
goos: [ windows ]
1818
goarch: [ amd64, arm64 ]
1919
steps:
20-
- uses: actions/checkout@v6
20+
- uses: actions/checkout@v7
2121
- uses: ./
2222
name: "Common Setup"
2323

@@ -33,7 +33,7 @@ jobs:
3333
azuresigntool sign -kvu ${{ secrets.AZURE_KEY_VAULT_URL }} -kvi ${{ secrets.AZURE_KEY_VAULT_CLIENT_ID }} -kvs ${{ secrets.AZURE_KEY_VAULT_CLIENT_SECRET }} -kvc ${{ secrets.AZURE_KEY_VAULT_CERTIFICATE_NAME }} -kvt ${{ secrets.AZURE_KEY_VAULT_TENANT_ID }} -tr http://timestamp.digicert.com -v out\ftb-server-${{ matrix.goos }}-${{ matrix.goarch }}.exe
3434
3535
- name: Upload artifact
36-
uses: actions/upload-artifact@v6
36+
uses: actions/upload-artifact@v7
3737
with:
3838
name: release-windows-${{ matrix.goarch }}
3939
path: |
@@ -47,7 +47,7 @@ jobs:
4747
goos: [ darwin ]
4848
goarch: [ amd64, arm64 ]
4949
steps:
50-
- uses: actions/checkout@v6
50+
- uses: actions/checkout@v7
5151
- uses: ./
5252
name: "Common Setup"
5353

@@ -90,7 +90,7 @@ jobs:
9090
xcrun notarytool submit "ftb-server_signed.zip" --key "./apple_api_key.p8" --key-id ${{ secrets.APPLE_API_KEY_ID }} --issuer ${{ secrets.APPLE_API_ISSUER }} --wait
9191
9292
- name: Upload artifact
93-
uses: actions/upload-artifact@v6
93+
uses: actions/upload-artifact@v7
9494
with:
9595
name: release-macos-${{ matrix.goarch }}
9696
path: |
@@ -105,7 +105,7 @@ jobs:
105105
goos: [ linux, freebsd ]
106106
goarch: [ amd64, arm64 ]
107107
steps:
108-
- uses: actions/checkout@v6
108+
- uses: actions/checkout@v7
109109
- uses: ./
110110
name: "Common Setup"
111111

@@ -117,7 +117,7 @@ jobs:
117117
chmod +x out/ftb-server-${{ matrix.goos }}-${{ matrix.goarch }}
118118
119119
- name: Upload artifact
120-
uses: actions/upload-artifact@v4
120+
uses: actions/upload-artifact@v7
121121
with:
122122
name: release-${{ matrix.goos }}-${{ matrix.goarch }}
123123
path: |
@@ -162,7 +162,7 @@ jobs:
162162
packs: ${{ fromJson(needs.generate-matrix.outputs.packids) }}
163163
steps:
164164
- name: Download linux amd64 artifact
165-
uses: actions/download-artifact@v7
165+
uses: actions/download-artifact@v8
166166
with:
167167
name: release-linux-amd64
168168
path: release/
@@ -183,55 +183,55 @@ jobs:
183183
- test-installer
184184
runs-on: ubuntu-latest
185185
steps:
186-
- uses: actions/checkout@v6
186+
- uses: actions/checkout@v7
187187

188188
# Windows
189189
- name: Download windows amd64 artifact
190-
uses: actions/download-artifact@v7
190+
uses: actions/download-artifact@v8
191191
with:
192192
name: release-windows-amd64
193193
path: release/
194194

195195
- name: Download windows arm64 artifact
196-
uses: actions/download-artifact@v7
196+
uses: actions/download-artifact@v8
197197
with:
198198
name: release-windows-arm64
199199
path: release/
200200

201201
# Macos
202202
- name: Download macos amd64 artifact
203-
uses: actions/download-artifact@v7
203+
uses: actions/download-artifact@v8
204204
with:
205205
name: release-macos-amd64
206206
path: release/
207207

208208
- name: Download macos arm64 artifact
209-
uses: actions/download-artifact@v7
209+
uses: actions/download-artifact@v8
210210
with:
211211
name: release-macos-arm64
212212
path: release/
213213

214214
# Linux
215215
- name: Download linux arm64 artifact
216-
uses: actions/download-artifact@v7
216+
uses: actions/download-artifact@v8
217217
with:
218218
name: release-linux-arm64
219219
path: release/
220220

221221
- name: Download linux amd64 artifact
222-
uses: actions/download-artifact@v7
222+
uses: actions/download-artifact@v8
223223
with:
224224
name: release-linux-amd64
225225
path: release/
226226

227227
- name: Download freebsd arm64 artifact
228-
uses: actions/download-artifact@v7
228+
uses: actions/download-artifact@v8
229229
with:
230230
name: release-freebsd-arm64
231231
path: release/
232232

233233
- name: Download freebsd amd64 artifact
234-
uses: actions/download-artifact@v7
234+
uses: actions/download-artifact@v8
235235
with:
236236
name: release-freebsd-amd64
237237
path: release/

.github/workflows/snapshot.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
- goarch: "riscv64"
2121
goos: "windows"
2222
steps:
23-
- uses: actions/checkout@v6
23+
- uses: actions/checkout@v7
2424
- uses: ./
2525
name: "Common Setup"
2626

@@ -31,7 +31,7 @@ jobs:
3131
CGO_ENABLED=0 GOOS=${{ matrix.goos }} GOARCH=${{ matrix.goarch }} go build -o out/ftb-server-${{ matrix.goos }}-${{ matrix.goarch }} -ldflags "-X 'ftb-server-downloader/util.CfApiKey=$CF_API_KEY' -X 'ftb-server-downloader/util.GitCommit=$GITHUB_SHA_SHORT' -X 'ftb-server-downloader/util.ReleaseVersion=99.99.99-Dev'"
3232
3333
- name: Archive production artifacts
34-
uses: actions/upload-artifact@v6
34+
uses: actions/upload-artifact@v7
3535
with:
3636
name: ftb-server-${{ matrix.goos }}-${{ matrix.goarch }}
3737
overwrite: true

0 commit comments

Comments
 (0)