From dc54e349ff9d8f3693a43a7c56814adee12a8619 Mon Sep 17 00:00:00 2001 From: Jonas Plum Date: Tue, 15 Oct 2024 00:02:05 +0200 Subject: [PATCH] fix: win2k and winxp build (#167) --- .github/workflows/ci.yml | 6 ++++-- build/win2k/Dockerfile | 4 +++- build/winxp/Dockerfile | 4 +++- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6ff8a83..01803ea 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -184,7 +184,8 @@ jobs: - uses: actions/checkout@v4 - run: make build-win2k - - run: zip -r win2k.zip ./build/bin/artifactcollector2k.exe + - run: mv ./build/bin/artifactcollector2k.exe ./artifactcollector2k.exe + - run: zip -r win2k.zip ./artifactcollector2k.exe - uses: actions/upload-artifact@v4 with: @@ -205,7 +206,8 @@ jobs: - uses: actions/checkout@v4 - run: make build-winxp - - run: zip -r winxp.zip ./build/bin/artifactcollectorxp.exe + - run: mv ./build/bin/artifactcollectorxp.exe ./artifactcollectorxp.exe + - run: zip -r winxp.zip ./artifactcollectorxp.exe - uses: actions/upload-artifact@v4 with: diff --git a/build/win2k/Dockerfile b/build/win2k/Dockerfile index fecd0fa..06ffe05 100644 --- a/build/win2k/Dockerfile +++ b/build/win2k/Dockerfile @@ -7,7 +7,9 @@ WORKDIR /repo RUN go install golang.org/x/tools/cmd/goimports@v0.1.7 RUN go install github.com/forensicanalysis/go-resources/cmd/resources@v0.4.0 RUN go install github.com/akavel/rsrc@v0.10.2 -RUN go run tools/yaml2go/main.go config/ac.yaml config/artifacts/* +RUN rm -rf config/artifacts +RUN git clone https://github.com/forensicanalysis/artifacts.git config/artifacts +RUN go run tools/yaml2go/main.go config/ac.yaml config/artifacts/*.yaml RUN resources -package assets -output assets/bin.generated.go config/bin/* RUN rsrc -arch amd64 -manifest build/win/artifactcollector.exe.manifest -ico build/win/artifactcollector.ico -o build/win/artifactcollector.syso RUN rsrc -arch 386 -manifest build/win/artifactcollector32.exe.manifest -ico build/win/artifactcollector.ico -o build/win/artifactcollector32.syso diff --git a/build/winxp/Dockerfile b/build/winxp/Dockerfile index 1f02451..88773f1 100644 --- a/build/winxp/Dockerfile +++ b/build/winxp/Dockerfile @@ -7,7 +7,9 @@ WORKDIR /repo RUN go install golang.org/x/tools/cmd/goimports@v0.1.7 RUN go install github.com/forensicanalysis/go-resources/cmd/resources@v0.4.0 RUN go install github.com/akavel/rsrc@v0.10.2 -RUN go run tools/yaml2go/main.go config/ac.yaml config/artifacts/* +RUN rm -rf config/artifacts +RUN git clone https://github.com/forensicanalysis/artifacts.git config/artifacts +RUN go run tools/yaml2go/main.go config/ac.yaml config/artifacts/*.yaml RUN resources -package assets -output assets/bin.generated.go config/bin/* RUN rsrc -arch amd64 -manifest build/win/artifactcollector.exe.manifest -ico build/win/artifactcollector.ico -o build/win/artifactcollector.syso RUN rsrc -arch 386 -manifest build/win/artifactcollector32.exe.manifest -ico build/win/artifactcollector.ico -o build/win/artifactcollector32.syso