Skip to content

Commit 7c1e0c7

Browse files
authored
Fix/cfn init build (#163)
* Fix go build * Fix directory pathing
1 parent fdd89d8 commit 7c1e0c7

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

.github/workflows/release.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -77,12 +77,12 @@ jobs:
7777
fail-fast: true
7878
matrix:
7979
include:
80-
- { os: "ubuntu-latest", arch: "x64", platform: "linux" }
81-
- { os: "ubuntu-latest", arch: "arm64", platform: "linux" }
82-
- { os: "ubuntu-latest", arch: "arm", platform: "linux" }
83-
- { os: "macos-latest", arch: "x64", platform: "darwin" }
84-
- { os: "macos-latest", arch: "arm64", platform: "darwin" }
85-
- { os: "windows-latest", arch: "x64", platform: "win32" }
80+
- { os: "ubuntu-latest", arch: "x64", platform: "linux", go-arch: "amd64" }
81+
- { os: "ubuntu-latest", arch: "arm64", platform: "linux", go-arch: "arm64" }
82+
- { os: "ubuntu-latest", arch: "arm", platform: "linux", go-arch: "arm64" }
83+
- { os: "macos-latest", arch: "x64", platform: "darwin", go-arch: "amd64" }
84+
- { os: "macos-latest", arch: "arm64", platform: "darwin", go-arch: "arm64" }
85+
- { os: "windows-latest", arch: "x64", platform: "win32", go-arch: "amd64" }
8686
runs-on: ${{ matrix.os }}
8787
steps:
8888
- uses: actions/checkout@v5
@@ -127,9 +127,9 @@ jobs:
127127
GOPROXY: direct
128128
run: |
129129
if [[ "${{ runner.os }}" == "Windows" ]]; then
130-
go build -C ./cfn-init -v -o ../bundle/production/bin/cfn-init.exe
130+
GOARCH=${{ matrix.go-arch }} go build -C ./cfn-init/cmd -v -o ../../bundle/production/bin/cfn-init.exe
131131
else
132-
go build -C ./cfn-init -v -o ../bundle/production/bin/cfn-init
132+
GOARCH=${{ matrix.go-arch }} go build -C ./cfn-init/cmd -v -o ../../bundle/production/bin/cfn-init
133133
fi
134134
cp ./cfn-init/THIRD-PARTY-LICENSES.txt ./bundle/production/bin/
135135

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@
3030
"test:leaks": "NODE_ENV=test vitest run --pool=forks --logHeapUsage",
3131
"lint": "eslint --max-warnings 0 .",
3232
"lint:fix": "npm run lint -- --fix",
33-
"build:go:dev": "GOPROXY=direct go build -C cfn-init -v -o ../bundle/development/bin/cfn-init",
34-
"build:go:prod": "GOPROXY=direct go build -C cfn-init -v -o ../bundle/production/bin/cfn-init",
33+
"build:go:dev": "GOPROXY=direct go build -C cfn-init/cmd -v -o ../../bundle/development/bin/cfn-init",
34+
"build:go:prod": "GOPROXY=direct go build -C cfn-init/cmd -v -o ../../bundle/production/bin/cfn-init",
3535
"test:go": "GOPROXY=direct go test -C cfn-init ./...",
36-
"bundle": "rm -rf out && webpack --env mode=development",
36+
"bundle": "rm -rf out && webpack --env mode=development && npm run build:go:dev",
3737
"bundle:alpha": "rm -rf out && webpack --env mode=production --env env=alpha",
3838
"bundle:beta": "rm -rf out && webpack --env mode=production --env env=beta",
3939
"bundle:prod": "rm -rf out && webpack --env mode=production --env env=prod",

0 commit comments

Comments
 (0)