Skip to content

Commit dc54e34

Browse files
authored
fix: win2k and winxp build (#167)
1 parent f3bfef6 commit dc54e34

File tree

3 files changed

+10
-4
lines changed

3 files changed

+10
-4
lines changed

.github/workflows/ci.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,8 @@ jobs:
184184
- uses: actions/checkout@v4
185185

186186
- run: make build-win2k
187-
- run: zip -r win2k.zip ./build/bin/artifactcollector2k.exe
187+
- run: mv ./build/bin/artifactcollector2k.exe ./artifactcollector2k.exe
188+
- run: zip -r win2k.zip ./artifactcollector2k.exe
188189

189190
- uses: actions/upload-artifact@v4
190191
with:
@@ -205,7 +206,8 @@ jobs:
205206
- uses: actions/checkout@v4
206207

207208
- run: make build-winxp
208-
- run: zip -r winxp.zip ./build/bin/artifactcollectorxp.exe
209+
- run: mv ./build/bin/artifactcollectorxp.exe ./artifactcollectorxp.exe
210+
- run: zip -r winxp.zip ./artifactcollectorxp.exe
209211

210212
- uses: actions/upload-artifact@v4
211213
with:

build/win2k/Dockerfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@ WORKDIR /repo
77
RUN go install golang.org/x/tools/cmd/[email protected]
88
RUN go install github.com/forensicanalysis/go-resources/cmd/[email protected]
99
RUN go install github.com/akavel/[email protected]
10-
RUN go run tools/yaml2go/main.go config/ac.yaml config/artifacts/*
10+
RUN rm -rf config/artifacts
11+
RUN git clone https://github.com/forensicanalysis/artifacts.git config/artifacts
12+
RUN go run tools/yaml2go/main.go config/ac.yaml config/artifacts/*.yaml
1113
RUN resources -package assets -output assets/bin.generated.go config/bin/*
1214
RUN rsrc -arch amd64 -manifest build/win/artifactcollector.exe.manifest -ico build/win/artifactcollector.ico -o build/win/artifactcollector.syso
1315
RUN rsrc -arch 386 -manifest build/win/artifactcollector32.exe.manifest -ico build/win/artifactcollector.ico -o build/win/artifactcollector32.syso

build/winxp/Dockerfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@ WORKDIR /repo
77
RUN go install golang.org/x/tools/cmd/[email protected]
88
RUN go install github.com/forensicanalysis/go-resources/cmd/[email protected]
99
RUN go install github.com/akavel/[email protected]
10-
RUN go run tools/yaml2go/main.go config/ac.yaml config/artifacts/*
10+
RUN rm -rf config/artifacts
11+
RUN git clone https://github.com/forensicanalysis/artifacts.git config/artifacts
12+
RUN go run tools/yaml2go/main.go config/ac.yaml config/artifacts/*.yaml
1113
RUN resources -package assets -output assets/bin.generated.go config/bin/*
1214
RUN rsrc -arch amd64 -manifest build/win/artifactcollector.exe.manifest -ico build/win/artifactcollector.ico -o build/win/artifactcollector.syso
1315
RUN rsrc -arch 386 -manifest build/win/artifactcollector32.exe.manifest -ico build/win/artifactcollector.ico -o build/win/artifactcollector32.syso

0 commit comments

Comments
 (0)