From c7dda8f54c38d385a63a4a7876981b52e63f54f7 Mon Sep 17 00:00:00 2001 From: HenryNguyen5 <6404866+HenryNguyen5@users.noreply.github.com> Date: Mon, 28 Oct 2024 17:31:55 -0700 Subject: [PATCH] Only handle CCIP builds --- .goreleaser.develop.yaml | 104 -------------------------- tools/goreleaser-config/gen_config.go | 4 +- 2 files changed, 1 insertion(+), 107 deletions(-) diff --git a/.goreleaser.develop.yaml b/.goreleaser.develop.yaml index f23c677891..816f884cbd 100644 --- a/.goreleaser.develop.yaml +++ b/.goreleaser.develop.yaml @@ -35,110 +35,6 @@ snapshot: checksum: name_template: checksums.txt dockers: - - id: linux-amd64-chainlink - goos: linux - goarch: amd64 - dockerfile: core/chainlink.goreleaser.Dockerfile - image_templates: - - '{{ .Env.IMG_PRE }}/chainlink:{{ .Env.IMG_TAG }}' - - '{{ .Env.IMG_PRE }}/chainlink:{{ .Env.IMG_TAG }}-amd64' - - '{{ .Env.IMG_PRE }}/chainlink:sha-{{ .ShortCommit }}-amd64' - extra_files: - - tmp/libs - build_flag_templates: - - --platform=linux/amd64 - - --pull - - --build-arg=CHAINLINK_USER=chainlink - - --build-arg=COMMIT_SHA={{ .FullCommit }} - - --label=org.opencontainers.image.created={{ .Date }} - - --label=org.opencontainers.image.description="node of the decentralized oracle network, bridging on and off-chain computation" - - --label=org.opencontainers.image.licenses=MIT - - --label=org.opencontainers.image.revision={{ .FullCommit }} - - --label=org.opencontainers.image.source=https://github.com/smartcontractkit/chainlink - - --label=org.opencontainers.image.title=chainlink - - --label=org.opencontainers.image.url=https://github.com/smartcontractkit/chainlink - - --label=org.opencontainers.image.version={{ .Env.VERSION }} - use: buildx - - id: linux-amd64-chainlink-plugins - goos: linux - goarch: amd64 - dockerfile: core/chainlink.goreleaser.Dockerfile - image_templates: - - '{{ .Env.IMG_PRE }}/chainlink:{{ .Env.IMG_TAG }}-plugins' - - '{{ .Env.IMG_PRE }}/chainlink:{{ .Env.IMG_TAG }}-plugins-amd64' - - '{{ .Env.IMG_PRE }}/chainlink:sha-{{ .ShortCommit }}-plugins-amd64' - extra_files: - - tmp/libs - - tmp/plugins - build_flag_templates: - - --platform=linux/amd64 - - --pull - - --build-arg=CHAINLINK_USER=chainlink - - --build-arg=COMMIT_SHA={{ .FullCommit }} - - --build-arg=CL_MEDIAN_CMD=chainlink-feeds - - --build-arg=CL_MERCURY_CMD=chainlink-mercury - - --build-arg=CL_SOLANA_CMD=chainlink-solana - - --build-arg=CL_STARKNET_CMD=chainlink-starknet - - --label=org.opencontainers.image.created={{ .Date }} - - --label=org.opencontainers.image.description="node of the decentralized oracle network, bridging on and off-chain computation" - - --label=org.opencontainers.image.licenses=MIT - - --label=org.opencontainers.image.revision={{ .FullCommit }} - - --label=org.opencontainers.image.source=https://github.com/smartcontractkit/chainlink - - --label=org.opencontainers.image.title=chainlink - - --label=org.opencontainers.image.url=https://github.com/smartcontractkit/chainlink - - --label=org.opencontainers.image.version={{ .Env.VERSION }} - use: buildx - - id: linux-arm64-chainlink - goos: linux - goarch: arm64 - dockerfile: core/chainlink.goreleaser.Dockerfile - image_templates: - - '{{ .Env.IMG_PRE }}/chainlink:{{ .Env.IMG_TAG }}-arm64' - - '{{ .Env.IMG_PRE }}/chainlink:sha-{{ .ShortCommit }}-arm64' - extra_files: - - tmp/libs - build_flag_templates: - - --platform=linux/arm64 - - --pull - - --build-arg=CHAINLINK_USER=chainlink - - --build-arg=COMMIT_SHA={{ .FullCommit }} - - --label=org.opencontainers.image.created={{ .Date }} - - --label=org.opencontainers.image.description="node of the decentralized oracle network, bridging on and off-chain computation" - - --label=org.opencontainers.image.licenses=MIT - - --label=org.opencontainers.image.revision={{ .FullCommit }} - - --label=org.opencontainers.image.source=https://github.com/smartcontractkit/chainlink - - --label=org.opencontainers.image.title=chainlink - - --label=org.opencontainers.image.url=https://github.com/smartcontractkit/chainlink - - --label=org.opencontainers.image.version={{ .Env.VERSION }} - use: buildx - - id: linux-arm64-chainlink-plugins - goos: linux - goarch: arm64 - dockerfile: core/chainlink.goreleaser.Dockerfile - image_templates: - - '{{ .Env.IMG_PRE }}/chainlink:{{ .Env.IMG_TAG }}-plugins-arm64' - - '{{ .Env.IMG_PRE }}/chainlink:sha-{{ .ShortCommit }}-plugins-arm64' - extra_files: - - tmp/libs - - tmp/plugins - build_flag_templates: - - --platform=linux/arm64 - - --pull - - --build-arg=CHAINLINK_USER=chainlink - - --build-arg=COMMIT_SHA={{ .FullCommit }} - - --build-arg=CL_MEDIAN_CMD=chainlink-feeds - - --build-arg=CL_MERCURY_CMD=chainlink-mercury - - --build-arg=CL_SOLANA_CMD=chainlink-solana - - --build-arg=CL_STARKNET_CMD=chainlink-starknet - - --label=org.opencontainers.image.created={{ .Date }} - - --label=org.opencontainers.image.description="node of the decentralized oracle network, bridging on and off-chain computation" - - --label=org.opencontainers.image.licenses=MIT - - --label=org.opencontainers.image.revision={{ .FullCommit }} - - --label=org.opencontainers.image.source=https://github.com/smartcontractkit/chainlink - - --label=org.opencontainers.image.title=chainlink - - --label=org.opencontainers.image.url=https://github.com/smartcontractkit/chainlink - - --label=org.opencontainers.image.version={{ .Env.VERSION }} - use: buildx - id: linux-amd64-ccip goos: linux goarch: amd64 diff --git a/tools/goreleaser-config/gen_config.go b/tools/goreleaser-config/gen_config.go index 3b6c17761c..dc4f22a2e6 100644 --- a/tools/goreleaser-config/gen_config.go +++ b/tools/goreleaser-config/gen_config.go @@ -14,8 +14,6 @@ func Generate(environment string) config.Project { checkEnvironments(environment) architectures := []string{"amd64", "arm64"} - architectures := []string{"amd64", "arm64"} - project := config.Project{ ProjectName: "ccip", Version: 2, @@ -181,7 +179,7 @@ func dockers(environment string, architectures []string) []config.Docker { } case "develop", "production": - imageNames := []string{"chainlink", "ccip"} + imageNames := []string{"ccip"} for _, imageName := range imageNames { for _, arch := range architectures {