Skip to content

Commit 00ebcf3

Browse files
authored
Fix build (#144)
1 parent 5e78e47 commit 00ebcf3

File tree

2 files changed

+23
-22
lines changed

2 files changed

+23
-22
lines changed

.github/workflows/ci.yml

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ jobs:
1212
name: Backwards Compatibility
1313
runs-on: windows-latest
1414
steps:
15-
- name: Setup go 1.16
15+
- name: Setup go 1.17
1616
uses: actions/setup-go@v2
1717
with:
18-
go-version: 1.16.0
18+
go-version: 1.17.0
1919
- name: Checkout code
2020
uses: actions/checkout@v2
2121
with:
@@ -63,20 +63,20 @@ jobs:
6363
name: artifactcollector (win2k)
6464
runs-on: ubuntu-latest
6565
steps:
66-
- name: Setup go 1.16
66+
- name: Setup go 1.17
6767
uses: actions/setup-go@v2
6868
with:
69-
go-version: 1.16.0
69+
go-version: 1.17.0
7070
- name: Checkout code
7171
uses: actions/checkout@v2
7272
with:
7373
path: repo
74-
- name: Setup Build
75-
run: |
76-
go mod download
77-
go mod vendor
78-
go generate -mod=vendor
79-
mv resources/artifactcollector32.syso artifactcollector.syso
74+
- run: go mod vendor
75+
working-directory: repo
76+
# - run: go mod download
77+
- run: go generate -mod=readonly
78+
working-directory: repo
79+
- run: mv resources/artifactcollector32.syso artifactcollector.syso
8080
working-directory: repo
8181
- name: Build
8282
run: |
@@ -111,20 +111,20 @@ jobs:
111111
name: artifactcollector (winxp)
112112
runs-on: ubuntu-latest
113113
steps:
114-
- name: Setup go 1.16
114+
- name: Setup go 1.17
115115
uses: actions/setup-go@v2
116116
with:
117-
go-version: 1.16.0
117+
go-version: 1.17.0
118118
- name: Checkout code
119119
uses: actions/checkout@v2
120120
with:
121121
path: repo
122-
- name: Setup Build
123-
run: |
124-
go mod download
125-
go mod vendor
126-
go generate -mod=vendor
127-
mv resources/artifactcollector32.syso artifactcollector.syso
122+
- run: go mod vendor
123+
working-directory: repo
124+
# - run: go mod download
125+
- run: go generate -mod=readonly
126+
working-directory: repo
127+
- run: mv resources/artifactcollector32.syso artifactcollector.syso
128128
working-directory: repo
129129
- name: Move packages
130130
run: |
@@ -162,10 +162,10 @@ jobs:
162162
os: [ macos-latest, windows-latest, ubuntu-latest ]
163163
fail-fast: false
164164
steps:
165-
- name: Setup go 1.16
165+
- name: Setup go 1.17
166166
uses: actions/setup-go@v2
167167
with:
168-
go-version: 1.16.0
168+
go-version: 1.17.0
169169
- name: Checkout code
170170
uses: actions/checkout@v2
171171
- name: Download dependencies

main.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,9 @@ import (
4343
"github.com/forensicanalysis/artifactsgo"
4444
)
4545

46-
//go:generate go get golang.org/x/tools/cmd/goimports github.com/cugu/go-resources/cmd/[email protected] github.com/akavel/rsrc
47-
//go:generate go mod tidy
46+
//go:generate go install golang.org/x/tools/cmd/[email protected]
47+
//go:generate go install github.com/cugu/go-resources/cmd/[email protected]
48+
//go:generate go install github.com/akavel/[email protected]
4849
//go:generate go run scripts/yaml2go/main.go pack/ac.yaml pack/artifacts/*
4950
//go:generate resources -package assets -output assets/bin.generated.go pack/bin/*
5051
//go:generate rsrc -arch amd64 -manifest resources/artifactcollector.exe.manifest -ico resources/artifactcollector.ico -o resources/artifactcollector.syso

0 commit comments

Comments
 (0)