diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 01f14db9..af796171 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -37,8 +37,8 @@ jobs: - name: Run GoReleaser uses: goreleaser/goreleaser-action@v6 with: - args: -p 3 release version: '~> v2' + args: release - name: Upload binaries uses: actions/upload-artifact@v4 diff --git a/.gitignore b/.gitignore index dc29af3a..ba0f7dcc 100644 --- a/.gitignore +++ b/.gitignore @@ -26,6 +26,7 @@ yarn.lock ci-scripts .work/ dist/ +out/ provider/**/schema-embed.json diff --git a/.goreleaser.yml b/.goreleaser.yml index 7ca8bc15..270ddb9b 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -4,8 +4,8 @@ version: 2 before: hooks: - - make dist/baremetal-provisioner.service - - make dist/install.sh + - make out/baremetal-provisioner.service + - make out/install.sh builds: - id: resource @@ -50,8 +50,8 @@ release: prerelease: auto extra_files: - glob: dist/provisioner-* - - glob: dist/install.sh - - glob: dist/baremetal-provisioner.service + - glob: out/install.sh + - glob: out/baremetal-provisioner.service snapshot: name_template: '{{ .Tag }}-SNAPSHOT' diff --git a/Makefile b/Makefile index 5c2166c0..85e8cddb 100644 --- a/Makefile +++ b/Makefile @@ -47,7 +47,7 @@ ensure:: cd tests && go mod tidy remake:: - rm -rf bin .make .test hack/.work dist/ + rm -rf bin dist out .make .test hack/.work provider:: bin/$(PROVIDER) @@ -179,10 +179,10 @@ install_nodejs_sdk:: yarn link --cwd $(WORKING_DIR)/sdk/nodejs/bin # ------- Real Targets ------- -dist/install.sh: $(PROVIDER_PATH)/cmd/provisioner/install.sh +out/install.sh: $(PROVIDER_PATH)/cmd/provisioner/install.sh mkdir -p '${@D}' && cp '$<' '$@' -dist/baremetal-provisioner.service: $(PROVIDER_PATH)/cmd/provisioner/baremetal-provisioner.service +out/baremetal-provisioner.service: $(PROVIDER_PATH)/cmd/provisioner/baremetal-provisioner.service mkdir -p '${@D}' && cp '$<' '$@' bin/$(PROVIDER):: $(GEN_SRC) $(MAN_SRC) $(PKG_SRC) provider/*go* @@ -222,7 +222,7 @@ buf.lock: $(BUF_CONFIG) cd tests/sdk/$* && go test -v -count=1 -cover -timeout 2h ./... @touch $@ -.test/install_script: dist/install.sh +.test/install_script: out/install.sh DEV_MODE=true INSTALL_DIR=${WORKING_DIR}/bin $< @touch $@