From 58fd6ac0db28f7be1161e4b74e1d46faa60140f5 Mon Sep 17 00:00:00 2001 From: Dan Adams Date: Thu, 3 Oct 2024 14:25:21 -0700 Subject: [PATCH] small updates --- build/goreleaser/linux/build_legac.yml | 67 +++++++++++++++++++ ...build_legacy.yml => build_legacy_fips.yml} | 0 build/release.mk | 13 ++-- 3 files changed, 74 insertions(+), 6 deletions(-) create mode 100644 build/goreleaser/linux/build_legac.yml rename build/goreleaser/linux/{build_legacy.yml => build_legacy_fips.yml} (100%) diff --git a/build/goreleaser/linux/build_legac.yml b/build/goreleaser/linux/build_legac.yml new file mode 100644 index 000000000..7e8c8fe15 --- /dev/null +++ b/build/goreleaser/linux/build_legac.yml @@ -0,0 +1,67 @@ + # build other arch + - id: linux-agent-legacy + main: ./cmd/newrelic-infra + binary: newrelic-infra + env: + - CGO_ENABLED=0 + goos: + - linux + ldflags: + - -s -w -X main.buildVersion={{.Version}} + - -s -w -X main.gitCommit={{.Commit}} + - -s -w -X main.buildDate={{.Date}} + goarch: + - 386 + - mips + - mips64 + - mipsle + - mips64le + - ppc64le + - s390x + gomips: + - hardfloat + + - id: linux-ctl-legacy + main: ./cmd/newrelic-infra-ctl + binary: newrelic-infra-ctl + env: + - CGO_ENABLED=0 + goos: + - linux + ldflags: + - -s -w -X main.buildVersion={{.Version}} + - -s -w -X main.gitCommit={{.Commit}} + - -s -w -X main.buildDate={{.Date}} + goarch: + - 386 + - mips + - mips64 + - mipsle + - mips64le + - ppc64le + - s390x + gomips: + - hardfloat + + - id: linux-service-legacy + main: ./cmd/newrelic-infra-service + binary: newrelic-infra-service + env: + - CGO_ENABLED=0 + goos: + - linux + ldflags: + - -s -w -X main.buildVersion={{.Version}} + - -s -w -X main.gitCommit={{.Commit}} + - -s -w -X main.buildDate={{.Date}} + goarch: + - 386 + - mips + - mips64 + - mipsle + - mips64le + - ppc64le + - s390x + gomips: + - hardfloat + # end build other arch \ No newline at end of file diff --git a/build/goreleaser/linux/build_legacy.yml b/build/goreleaser/linux/build_legacy_fips.yml similarity index 100% rename from build/goreleaser/linux/build_legacy.yml rename to build/goreleaser/linux/build_legacy_fips.yml diff --git a/build/release.mk b/build/release.mk index 6b28a9fe8..31ca6982f 100644 --- a/build/release.mk +++ b/build/release.mk @@ -71,12 +71,12 @@ release/pkg-linux: release/get-fluentbit-linux-arm64 .PHONY : release/pkg-linux-fips release/pkg-linux-fips: release/deps release/clean generate-goreleaser-multiarch-fips -release/pkg-linux-fips: release/get-integrations-amd64 #NO FIPS ASSETS AVAILABLE FOR NOW -release/pkg-linux-fips: release/get-integrations-arm64 #NO FIPS ASSETS AVAILABLE FOR NOW -release/pkg-linux-fips: release/get-integrations-arm #NO FIPS ASSETS AVAILABLE FOR NOW -release/pkg-linux-fips: release/get-fluentbit-linux-amd64 #NO FIPS ASSETS AVAILABLE FOR NOW -#release/pkg-linux: release/get-fluentbit-linux-arm -release/pkg-linux-fips: release/get-fluentbit-linux-arm64 #NO FIPS ASSETS AVAILABLE FOR NOW +# release/pkg-linux-fips: release/get-integrations-amd64 #NO FIPS ASSETS AVAILABLE FOR NOW +# release/pkg-linux-fips: release/get-integrations-arm64 #NO FIPS ASSETS AVAILABLE FOR NOW +# release/pkg-linux-fips: release/get-integrations-arm #NO FIPS ASSETS AVAILABLE FOR NOW +# release/pkg-linux-fips: release/get-fluentbit-linux-amd64 #NO FIPS ASSETS AVAILABLE FOR NOW +# #release/pkg-linux: release/get-fluentbit-linux-arm +# release/pkg-linux-fips: release/get-fluentbit-linux-arm64 #NO FIPS ASSETS AVAILABLE FOR NOW @echo "=== [release/pkg-linux-fips] PRE-RELEASE compiling all binaries, creating packages, archives" $(GORELEASER_BIN) release --config $(GORELEASER_CONFIG_LINUX) $(PKG_FLAGS) @@ -340,6 +340,7 @@ generate-goreleaser-multiarch-fips: cat $(CURDIR)/build/goreleaser/linux/header.yml\ $(CURDIR)/build/goreleaser/linux/build_amd64_fips.yml\ $(CURDIR)/build/goreleaser/linux/build_arm64_fips.yml\ + $(CURDIR)/build/goreleaser/linux/build_legacy_fips.yml\ $(CURDIR)/build/goreleaser/linux/archives_header.yml\ $(CURDIR)/build/goreleaser/linux/archives_amd64.yml\ $(CURDIR)/build/goreleaser/linux/archives_arm64.yml\