Skip to content

Commit cdcc506

Browse files
committed
fix make target ci/deps and remove duplication of dependencies in goreleaser.yml
1 parent 2fcab48 commit cdcc506

2 files changed

Lines changed: 2 additions & 17 deletions

File tree

build/.goreleaser.yml

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -88,10 +88,6 @@ nfpms:
8888
type: config
8989

9090
overrides:
91-
deb:
92-
dependencies:
93-
- newrelic-infra (>= 1.20.0)
94-
- nrjmx (>= 2.3.2)
9591
rpm:
9692
file_name_template: >-
9793
{{- .ProjectName }}-
@@ -100,9 +96,6 @@ nfpms:
10096
{{- else -}}
10197
{{ .Arch }}
10298
{{- end }}
103-
dependencies:
104-
- newrelic-infra >= 1.20.0
105-
- nrjmx >= 2.3.2
10699
107100
# Formats to be generated.
108101
formats:
@@ -141,10 +134,6 @@ nfpms:
141134
type: config
142135

143136
overrides:
144-
deb:
145-
dependencies:
146-
- newrelic-infra-fips (>= 1.60.0)
147-
- nrjmx-fips (>= 2.8.0)
148137
rpm:
149138
file_name_template: >-
150139
{{- .ProjectName }}-fips-
@@ -153,9 +142,6 @@ nfpms:
153142
{{- else -}}
154143
{{ .Arch }}
155144
{{- end }}
156-
dependencies:
157-
- newrelic-infra-fips >= 1.60.0
158-
- nrjmx-fips >= 2.8.0
159145
160146
# Formats to be generated.
161147
formats:

build/ci.mk

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,8 @@
22
ci/pull-builder-image:
33
@docker pull $(BUILDER_IMAGE)
44

5-
.PHONY : ci/pull-builder-image
6-
ci/deps:
7-
@docker build -t $(BUILDER_IMAGE) -f $(CURDIR)/build/Dockerfile $(CURDIR)
5+
.PHONY : ci/deps
6+
ci/deps: ci/pull-builder-image
87

98
.PHONY : ci/debug-container
109
ci/debug-container: ci/deps

0 commit comments

Comments
 (0)