update release workflow

observIQ · Jul 16, 2024 · 143afe7 · 143afe7
1 parent eb3f8f2
commit 143afe7
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 27 deletions.
diff --git a/.github/workflows/multi_build.yml b/.github/workflows/multi_build.yml
@@ -52,7 +52,7 @@ jobs:
       - name: Scan Third Party Dependency Licenses
         run: |
           go install github.com/uw-labs/[email protected]
-          lichen --config=./license.yaml $(find dist/observiq-agent-distro_* dist/updater_*)
+          lichen --config=./license.yaml $(find dist/collector_* dist/updater_*)
 
   build_darwin:
     runs-on: macos-14
@@ -80,7 +80,7 @@ jobs:
       - name: Scan Third Party Dependency Licenses
         run: |
           go install github.com/uw-labs/[email protected]
-          lichen --config=./license.yaml $(find dist/observiq-agent-distro_* dist/updater_*)
+          lichen --config=./license.yaml $(find dist/collector_* dist/updater_*)
 
   build_windows:
     runs-on: ubuntu-20.04
@@ -108,4 +108,4 @@ jobs:
       - name: Scan Third Party Dependency Licenses
         run: |
           go install github.com/uw-labs/[email protected]
-          lichen --config=./license.yaml dist/observiq-agent-distro_windows_amd64.exe dist/updater_windows_amd64.exe
+          lichen --config=./license.yaml dist/collector_windows_amd64.exe dist/updater_windows_amd64.exe
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -15,20 +15,12 @@ jobs:
         with:
           go-version-file: go.mod
           cache-dependency-path: "**/go.sum"
-      - name: Run GoReleaser
-        uses: goreleaser/goreleaser-action@v5
-        with:
-          # either 'goreleaser' (default) or 'goreleaser-pro'
-          distribution: goreleaser-pro
-          version: "v1.22.1"
-          args: build --single-target --skip=validate --clean
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          GORELEASER_KEY: ${{ secrets.GORELEASER_KEY }}
+      - name: Build Windows Binaries
+        run: make build-binaries
       - name: Copy Windows Collector Binary
-        run: cp dist/windows_amd64/collector_windows_amd64_v1/observiq-otel-collector.exe windows/observiq-otel-collector.exe
+        run: cp dist/collector_windows_amd64.exe windows/observiq-otel-collector.exe
       - name: Copy Windows Updater Binary
-        run: cp dist/windows_amd64/updater_windows_amd64_v1/updater.exe windows/updater.exe
+        run: cp dist/updater_windows_amd64.exe windows/updater.exe
       - name: Copy Plugins to MSI Build Directory
         run: cp -r release_deps/plugins windows/
       - name: Copy Example Config

diff --git a/.goreleaser.yml b/.goreleaser.yml
@@ -5,12 +5,17 @@ before:
     - make release-prep CURR_VERSION={{ .Version }}
     - make build-all OUTDIR="tmp"
 
+after:
+  hooks:
+    - cmd: rm -rf tmp
+
 # https://goreleaser.com/customization/build/
 builds:
   # https://goreleaser.com/customization/builds/#import-pre-built-binaries
   - id: collector
     builder: prebuilt
     binary: observiq-otel-collector
+    mod_timestamp: "{{ .CommitTimestamp }}"
     goos:
       - windows
       - linux
@@ -35,13 +40,10 @@ builds:
       - goos: darwin
         goarch: ppc64le
     prebuilt:
-      path: tmp/collector_{{ .Os }}_{{ .Arch }}/observiq-otel-collector{{ .Ext }}
+      path: tmp/collector_{{ .Os }}_{{ .Arch }}{{ .Ext }}
   - id: updater
+    builder: prebuilt
     binary: updater
-    dir: ./updater/
-    main: ./cmd/updater
-    env:
-      - CGO_ENABLED=0
     mod_timestamp: "{{ .CommitTimestamp }}"
     goos:
       - windows
@@ -66,12 +68,8 @@ builds:
         goarch: ppc64
       - goos: darwin
         goarch: ppc64le
-    ldflags:
-      - -s -w
-      - -X github.com/observiq/bindplane-agent/updater/internal/version.version=v{{ .Version }}
-      - -X github.com/observiq/bindplane-agent/updater/internal/version.gitHash={{ .FullCommit }}
-      - -X github.com/observiq/bindplane-agent/updater/internal/version.date={{ .Date }}
-    no_unique_dist_dir: false
+    prebuilt:
+      path: tmp/updater_{{ .Os }}_{{ .Arch }}{{ .Ext }}
 
 # https://goreleaser.com/customization/archive/
 archives:

diff --git a/Makefile b/Makefile
@@ -33,7 +33,7 @@ VERSION ?= $(if $(CURRENT_TAG),$(CURRENT_TAG),$(PREVIOUS_TAG))
 .PHONY: agent
 agent:
 	builder --config="./manifests/observIQ/manifest.yaml"
-	mkdir -p $(OUTDIR)/collector_$(GOOS)_$(GOARCH); cp ./builder/observiq-otel-collector $(OUTDIR)/collector_$(GOOS)_$(GOARCH)/observiq-otel-collector$(EXT)
+	mkdir -p $(OUTDIR); cp ./builder/observiq-otel-collector $(OUTDIR)/collector_$(GOOS)_$(GOARCH)$(EXT)
 
 # Builds a custom distro for the current GOOS/GOARCH pair using the manifest specified
 # MANIFEST = path to the manifest file for the distro to be built
@@ -46,6 +46,14 @@ distro:
 # TODO:(dakota) Updater likely to change and so is this cmd
 .PHONY: updater
 updater:
+	cd ./updater/; go build -ldflags "-s -w\
+		-X 'github.com/observiq/bindplane-agent/updater/internal/version.version=$(VERSION)'\
+		-X 'github.com/observiq/bindplane-agent/updater/internal/version.gitHash=$(shell git rev-parse HEAD)'\
+		-X 'github.com/observiq/bindplane-agent/updater/internal/version.date=$(shell date -u +"%Y-%m-%dT%H:%M:%SZ")'"\
+		-o ../$(OUTDIR)/updater_$(GOOS)_$(GOARCH)$(EXT) ./cmd/updater
+
+.PHONY: updater-local
+updater-local:
 	cd ./updater/; go build -o ../$(OUTDIR)/updater_$(GOOS)_$(GOARCH)$(EXT) ./cmd/updater
 
 # Runs the supervisor invoking the agent build in /dist
@@ -231,6 +239,7 @@ release-prep:
 	@rm -rf release_deps
 	@mkdir release_deps
 	@echo 'v$(CURR_VERSION)' > release_deps/VERSION.txt
+	./buildscripts/download-dependencies.sh release_deps
 	@cp -r ./plugins release_deps/
 	@cp config/example.yaml release_deps/config.yaml
 	@cp config/logging.yaml release_deps/logging.yaml