Skip to content
This repository was archived by the owner on Jul 27, 2023. It is now read-only.

Commit 3b5ec1a

Browse files
author
Sami Tabet
authored
Merge pull request #196 from DataDog/sami/fix-win-ci
[fix] Fix windows CI
2 parents 42ae42b + f295918 commit 3b5ec1a

1 file changed

Lines changed: 3 additions & 2 deletions

File tree

gorake.rb

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,13 +65,14 @@ def go_build(program, opts={})
6565
end
6666

6767
if ENV['windres'] then
68+
resdir = "cmd/agent/windows_resources"
6869
# first compile the message table, as it's an input to the resource file
69-
msgcmd = "windmc --target pe-x86-64 -r agent/windows_resources agent/windows_resources/process-agent-msg.mc"
70+
msgcmd = "windmc --target pe-x86-64 -r #{resdir} #{resdir}/process-agent-msg.mc"
7071
puts msgcmd
7172
sh msgcmd
7273

7374
rescmd = "windres --define MAJ_VER=#{winversion[0]} --define MIN_VER=#{winversion[1]} --define PATCH_VER=#{winversion[2]} "
74-
rescmd += "-i agent/windows_resources/process-agent.rc --target=pe-x86-64 -O coff -o agent/rsrc.syso"
75+
rescmd += "-i #{resdir}/process-agent.rc --target=pe-x86-64 -O coff -o cmd/agent/rsrc.syso"
7576
sh rescmd
7677
end
7778

0 commit comments

Comments
 (0)