diff --git a/.goreleaser.yml b/.goreleaser.yml index 408afbc42..637bb9d88 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -19,28 +19,16 @@ builds: binary: observiq-otel-collector mod_timestamp: "{{ .CommitTimestamp }}" goos: - - windows - linux - darwin goarch: - amd64 - arm64 - - arm - - ppc64 - - ppc64le ignore: - - goos: windows - goarch: arm - - goos: windows + - goos: linux goarch: arm64 - - goos: windows - goarch: ppc64 - - goos: windows - goarch: ppc64le - goos: darwin - goarch: ppc64 - - goos: darwin - goarch: ppc64le + goarch: amd64 prebuilt: path: tmp/collector_{{ .Os }}_{{ .Arch }}{{ .Ext }} - id: updater @@ -48,56 +36,32 @@ builds: binary: updater mod_timestamp: "{{ .CommitTimestamp }}" goos: - - windows - linux - darwin goarch: - amd64 - arm64 - - arm - - ppc64 - - ppc64le ignore: - - goos: windows - goarch: arm - - goos: windows + - goos: linux goarch: arm64 - - goos: windows - goarch: ppc64 - - goos: windows - goarch: ppc64le - - goos: darwin - goarch: ppc64 - goos: darwin - goarch: ppc64le + goarch: amd64 prebuilt: path: tmp/updater_{{ .Os }}_{{ .Arch }}{{ .Ext }} - id: supervisor builder: prebuilt binary: opampsupervisor goos: - - windows - linux - darwin goarch: - amd64 - arm64 - - arm - - ppc64 - - ppc64le ignore: - - goos: windows - goarch: arm - - goos: windows + - goos: linux goarch: arm64 - - goos: windows - goarch: ppc64 - - goos: windows - goarch: ppc64le - - goos: darwin - goarch: ppc64 - goos: darwin - goarch: ppc64le + goarch: amd64 prebuilt: path: release_deps/supervisor_bin/opampsupervisor_{{ .Os }}_{{ .Arch }}{{ .Ext }} diff --git a/Makefile b/Makefile index 084f599d4..9bf2e08e9 100644 --- a/Makefile +++ b/Makefile @@ -72,10 +72,10 @@ reset: kill build-binaries: agent updater .PHONY: build-all -build-all: build-linux build-darwin build-windows +build-all: build-linux-amd64 build-darwin-arm64 .PHONY: build-linux -build-linux: build-linux-amd64 build-linux-arm64 build-linux-arm build-linux-ppc64 build-linux-ppc64le +build-linux: build-linux-amd64 build-linux-arm64 .PHONY: build-darwin build-darwin: build-darwin-amd64 build-darwin-arm64 diff --git a/buildscripts/download-dependencies.sh b/buildscripts/download-dependencies.sh index aa74647e2..3a6e53f76 100755 --- a/buildscripts/download-dependencies.sh +++ b/buildscripts/download-dependencies.sh @@ -32,7 +32,7 @@ curl -fL -o "$DOWNLOAD_DIR/opentelemetry-java-contrib-jmx-metrics.jar" \ # download contrib repo and manually build supervisor repos echo "Cloning supervisor repo" SUPERVISOR_REPO="https://github.com/open-telemetry/opentelemetry-collector-contrib.git" -PLATFORMS=("linux/amd64" "linux/arm64" "linux/arm" "linux/ppc64" "linux/ppc64le" "darwin/amd64" "darwin/arm64" "windows/amd64") +PLATFORMS=("linux/amd64" "darwin/arm64") mkdir "$DOWNLOAD_DIR/supervisor_bin" $(cd $DOWNLOAD_DIR && git clone --depth 1 "$SUPERVISOR_REPO")