Skip to content

Commit 288e7cf

Browse files
committed
Merge branch 'master' into gamefeatures
2 parents f8e2a80 + 2982cca commit 288e7cf

3 files changed

Lines changed: 28 additions & 25 deletions

File tree

.github/workflows/push.yaml

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@ jobs:
1111
os: [ubuntu-latest, windows-latest]
1212
runs-on: ${{ matrix.os }}
1313
steps:
14+
- name: Check out code into the Go module directory
15+
uses: actions/checkout@v6
16+
1417
- name: Set up Go
15-
uses: actions/setup-go@v2
18+
uses: actions/setup-go@v6
1619
with:
1720
go-version: 1.21.4
1821

19-
- name: Check out code into the Go module directory
20-
uses: actions/checkout@v2
21-
2222
- name: Download GQL schema
2323
run: "npx graphqurl https://api.ficsit.dev/v2/query --introspect -H 'content-type: application/json' > schema.graphql"
2424

@@ -30,7 +30,7 @@ jobs:
3030
env:
3131
CGO_ENABLED: 1
3232

33-
- uses: actions/upload-artifact@v4
33+
- uses: actions/upload-artifact@v7
3434
with:
3535
name: cli-${{ matrix.os }}
3636
path: ficsit-cli
@@ -39,26 +39,24 @@ jobs:
3939
name: Lint
4040
runs-on: ubuntu-latest
4141
steps:
42+
- name: Check out code into the Go module directory
43+
uses: actions/checkout@v6
44+
4245
- name: Set up Go
43-
uses: actions/setup-go@v2
46+
uses: actions/setup-go@v6
4447
with:
4548
go-version: 1.21.4
4649

47-
- name: Check out code into the Go module directory
48-
uses: actions/checkout@v2
49-
5050
- name: Download GQL schema
5151
run: "npx graphqurl https://api.ficsit.dev/v2/query --introspect -H 'content-type: application/json' > schema.graphql"
5252

5353
- name: Go Generate
5454
run: go generate -tags tools -x ./...
5555

5656
- name: golangci-lint
57-
uses: golangci/golangci-lint-action@v2
57+
uses: golangci/golangci-lint-action@v6.4.1
5858
with:
5959
version: v1.62.2
60-
skip-pkg-cache: true
61-
skip-build-cache: true
6260

6361
test:
6462
name: Test
@@ -68,19 +66,22 @@ jobs:
6866
os: [ubuntu-latest, windows-latest]
6967
runs-on: ${{ matrix.os }}
7068
steps:
69+
- name: Check out code into the Go module directory
70+
uses: actions/checkout@v6
71+
7172
- name: Set up Go
72-
uses: actions/setup-go@v2
73+
uses: actions/setup-go@v6
7374
with:
7475
go-version: 1.21.4
7576

76-
- name: Check out code into the Go module directory
77-
uses: actions/checkout@v2
78-
7977
- name: Setup steamcmd
8078
uses: CyberAndrii/setup-steamcmd@v1
8179

8280
- name: Install Satisfactory Dedicated Server
83-
run: steamcmd +login anonymous +force_install_dir ${{ github.workspace }}/SatisfactoryDedicatedServer +app_update 1690800 validate +quit
81+
run: |
82+
# Run steamcmd twice to work around some weird caching/out of order execution issue that causes steamcmd to fail to download the app on the first try
83+
steamcmd +login anonymous +app_info_update 1 validate +quit
84+
steamcmd +force_install_dir "${{ github.workspace }}/SatisfactoryDedicatedServer" +login anonymous +app_update 1690800 validate +quit
8485
8586
- name: Change directory permissions
8687
if: ${{ matrix.os == 'ubuntu-latest' }}

.github/workflows/release.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,16 @@ jobs:
1010
name: Release
1111
runs-on: ubuntu-latest
1212
steps:
13-
- name: Set up Go
14-
uses: actions/setup-go@v2
15-
with:
16-
go-version: 1.21
17-
1813
- name: Check out code into the Go module directory
19-
uses: actions/checkout@v2
14+
uses: actions/checkout@v6
2015
with:
2116
fetch-depth: 0
2217

18+
- name: Set up Go
19+
uses: actions/setup-go@v6
20+
with:
21+
go-version: 1.21
22+
2323
- name: Download GQL schema
2424
run: "npx graphqurl https://api.ficsit.dev/v2/query --introspect -H 'content-type: application/json' > schema.graphql"
2525

@@ -39,7 +39,7 @@ jobs:
3939
rm -rf ./upx/
4040
4141
- name: Run GoReleaser
42-
uses: goreleaser/goreleaser-action@v2
42+
uses: goreleaser/goreleaser-action@v7
4343
with:
4444
version: latest
4545
args: release --clean

.goreleaser.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
version: 2
2+
13
project_name: ficsit
24

35
before:
@@ -58,7 +60,7 @@ checksum:
5860
name_template: 'checksums.txt'
5961

6062
snapshot:
61-
name_template: "{{ .Tag }}-next"
63+
version_template: "{{ .Tag }}-next"
6264

6365
changelog:
6466
sort: asc

0 commit comments

Comments
 (0)