weiguoqiang/cert-manager
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #5050 from jahrlin/master

Browse Source 
trim leading ./ from release archives created by Make
This commit is contained in:
jetstack-bot 2022-04-25 13:34:20 +01:00 committed by GitHub
commit d7a3a39767
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
make/cmctl.mk
View File

@ -31,7 +31,8 @@ bin/release/cert-manager-cmctl-linux-amd64.tar.gz bin/release/cert-manager-cmctl
mkdir -p $(TARDIR) mkdir -p $(TARDIR)
cp $< $(TARDIR)/cmctl cp $< $(TARDIR)/cmctl
cp bin/scratch/cert-manager.license $(TARDIR)/LICENSE cp bin/scratch/cert-manager.license $(TARDIR)/LICENSE
tar czf $@ -C $(TARDIR) . # removes leading ./ from archived paths
find $(TARDIR) -maxdepth 1 -mindepth 1 | sed 's|.*/||' | tar czf $@ -C $(TARDIR) -T -
rm -rf $(TARDIR) rm -rf $(TARDIR)
bin/metadata/cert-manager-cmctl-linux-amd64.tar.gz.metadata.json bin/metadata/cert-manager-cmctl-linux-arm64.tar.gz.metadata.json bin/metadata/cert-manager-cmctl-linux-s390x.tar.gz.metadata.json bin/metadata/cert-manager-cmctl-linux-ppc64le.tar.gz.metadata.json bin/metadata/cert-manager-cmctl-linux-arm.tar.gz.metadata.json: bin/metadata/cert-manager-cmctl-linux-%.tar.gz.metadata.json: bin/release/cert-manager-cmctl-linux-%.tar.gz hack/artifact-metadata.template.json | bin/metadata bin/metadata/cert-manager-cmctl-linux-amd64.tar.gz.metadata.json bin/metadata/cert-manager-cmctl-linux-arm64.tar.gz.metadata.json bin/metadata/cert-manager-cmctl-linux-s390x.tar.gz.metadata.json bin/metadata/cert-manager-cmctl-linux-ppc64le.tar.gz.metadata.json bin/metadata/cert-manager-cmctl-linux-arm.tar.gz.metadata.json: bin/metadata/cert-manager-cmctl-linux-%.tar.gz.metadata.json: bin/release/cert-manager-cmctl-linux-%.tar.gz hack/artifact-metadata.template.json | bin/metadata
@ -59,7 +60,8 @@ bin/release/cert-manager-cmctl-darwin-amd64.tar.gz bin/release/cert-manager-cmct
mkdir -p $(TARDIR) mkdir -p $(TARDIR)
cp $< $(TARDIR)/cmctl cp $< $(TARDIR)/cmctl
cp bin/scratch/cert-manager.license $(TARDIR)/LICENSE cp bin/scratch/cert-manager.license $(TARDIR)/LICENSE
tar czf $@ -C $(TARDIR) . # removes leading ./ from archived paths
find $(TARDIR) -maxdepth 1 -mindepth 1 | sed 's|.*/||' | tar czf $@ -C $(TARDIR) -T -
rm -rf $(TARDIR) rm -rf $(TARDIR)
bin/metadata/cert-manager-cmctl-darwin-amd64.tar.gz.metadata.json bin/metadata/cert-manager-cmctl-darwin-arm64.tar.gz.metadata.json: bin/metadata/cert-manager-cmctl-darwin-%.tar.gz.metadata.json: bin/release/cert-manager-cmctl-darwin-%.tar.gz hack/artifact-metadata.template.json | bin/metadata bin/metadata/cert-manager-cmctl-darwin-amd64.tar.gz.metadata.json bin/metadata/cert-manager-cmctl-darwin-arm64.tar.gz.metadata.json: bin/metadata/cert-manager-cmctl-darwin-%.tar.gz.metadata.json: bin/release/cert-manager-cmctl-darwin-%.tar.gz hack/artifact-metadata.template.json | bin/metadata
@ -95,7 +97,8 @@ bin/release/cert-manager-cmctl-windows-amd64.tar.gz: bin/cmctl/cmctl-windows-amd
mkdir -p $(TARDIR) mkdir -p $(TARDIR)
cp $< $(TARDIR)/cmctl.exe cp $< $(TARDIR)/cmctl.exe
cp bin/scratch/cert-manager.license $(TARDIR)/LICENSE cp bin/scratch/cert-manager.license $(TARDIR)/LICENSE
tar czf $@ -C $(TARDIR) . # removes leading ./ from archived paths
find $(TARDIR) -maxdepth 1 -mindepth 1 | sed 's|.*/||' | tar czf $@ -C $(TARDIR) -T -
rm -rf $(TARDIR) rm -rf $(TARDIR)
bin/metadata/cert-manager-cmctl-windows-amd64.tar.gz.metadata.json: bin/release/cert-manager-cmctl-windows-amd64.tar.gz hack/artifact-metadata.template.json | bin/metadata bin/metadata/cert-manager-cmctl-windows-amd64.tar.gz.metadata.json: bin/release/cert-manager-cmctl-windows-amd64.tar.gz hack/artifact-metadata.template.json | bin/metadata
@ -137,7 +140,8 @@ bin/release/cert-manager-kubectl-cert_manager-linux-amd64.tar.gz bin/release/cer
mkdir -p $(TARDIR) mkdir -p $(TARDIR)
cp $< $(TARDIR)/kubectl-cert_manager cp $< $(TARDIR)/kubectl-cert_manager
cp bin/scratch/cert-manager.license $(TARDIR)/LICENSE cp bin/scratch/cert-manager.license $(TARDIR)/LICENSE
tar czf $@ -C $(TARDIR) . # removes leading ./ from archived paths
find $(TARDIR) -maxdepth 1 -mindepth 1 | sed 's|.*/||' | tar czf $@ -C $(TARDIR) -T -
rm -rf $(TARDIR) rm -rf $(TARDIR)
bin/metadata/cert-manager-kubectl-cert_manager-linux-amd64.tar.gz.metadata.json bin/metadata/cert-manager-kubectl-cert_manager-linux-arm64.tar.gz.metadata.json bin/metadata/cert-manager-kubectl-cert_manager-linux-s390x.tar.gz.metadata.json bin/metadata/cert-manager-kubectl-cert_manager-linux-ppc64le.tar.gz.metadata.json bin/metadata/cert-manager-kubectl-cert_manager-linux-arm.tar.gz.metadata.json: bin/metadata/cert-manager-kubectl-cert_manager-linux-%.tar.gz.metadata.json: bin/release/cert-manager-kubectl-cert_manager-linux-%.tar.gz hack/artifact-metadata.template.json | bin/metadata bin/metadata/cert-manager-kubectl-cert_manager-linux-amd64.tar.gz.metadata.json bin/metadata/cert-manager-kubectl-cert_manager-linux-arm64.tar.gz.metadata.json bin/metadata/cert-manager-kubectl-cert_manager-linux-s390x.tar.gz.metadata.json bin/metadata/cert-manager-kubectl-cert_manager-linux-ppc64le.tar.gz.metadata.json bin/metadata/cert-manager-kubectl-cert_manager-linux-arm.tar.gz.metadata.json: bin/metadata/cert-manager-kubectl-cert_manager-linux-%.tar.gz.metadata.json: bin/release/cert-manager-kubectl-cert_manager-linux-%.tar.gz hack/artifact-metadata.template.json | bin/metadata
@ -165,7 +169,8 @@ bin/release/cert-manager-kubectl-cert_manager-darwin-amd64.tar.gz bin/release/ce
mkdir -p $(TARDIR) mkdir -p $(TARDIR)
cp $< $(TARDIR)/kubectl-cert_manager cp $< $(TARDIR)/kubectl-cert_manager
cp bin/scratch/cert-manager.license $(TARDIR)/LICENSE cp bin/scratch/cert-manager.license $(TARDIR)/LICENSE
tar czf $@ -C $(TARDIR) . # removes leading ./ from archived paths
find $(TARDIR) -maxdepth 1 -mindepth 1 | sed 's|.*/||' | tar czf $@ -C $(TARDIR) -T -
rm -rf $(TARDIR) rm -rf $(TARDIR)
bin/metadata/cert-manager-kubectl-cert_manager-darwin-amd64.tar.gz.metadata.json bin/metadata/cert-manager-kubectl-cert_manager-darwin-arm64.tar.gz.metadata.json: bin/metadata/cert-manager-kubectl-cert_manager-darwin-%.tar.gz.metadata.json: bin/release/cert-manager-kubectl-cert_manager-darwin-%.tar.gz hack/artifact-metadata.template.json | bin/metadata bin/metadata/cert-manager-kubectl-cert_manager-darwin-amd64.tar.gz.metadata.json bin/metadata/cert-manager-kubectl-cert_manager-darwin-arm64.tar.gz.metadata.json: bin/metadata/cert-manager-kubectl-cert_manager-darwin-%.tar.gz.metadata.json: bin/release/cert-manager-kubectl-cert_manager-darwin-%.tar.gz hack/artifact-metadata.template.json | bin/metadata
@ -201,7 +206,8 @@ bin/release/cert-manager-kubectl-cert_manager-windows-amd64.tar.gz: bin/kubectl-
mkdir -p $(TARDIR) mkdir -p $(TARDIR)
cp $< $(TARDIR)/kubectl-cert_manager.exe cp $< $(TARDIR)/kubectl-cert_manager.exe
cp bin/scratch/cert-manager.license $(TARDIR)/LICENSE cp bin/scratch/cert-manager.license $(TARDIR)/LICENSE
tar czf $@ -C $(TARDIR) . # removes leading ./ from archived paths
find $(TARDIR) -maxdepth 1 -mindepth 1 | sed 's|.*/||' | tar czf $@ -C $(TARDIR) -T -
rm -rf $(TARDIR) rm -rf $(TARDIR)
bin/metadata/cert-manager-kubectl-cert_manager-windows-amd64.tar.gz.metadata.json: bin/release/cert-manager-kubectl-cert_manager-windows-amd64.tar.gz hack/artifact-metadata.template.json | bin/metadata bin/metadata/cert-manager-kubectl-cert_manager-windows-amd64.tar.gz.metadata.json: bin/release/cert-manager-kubectl-cert_manager-windows-amd64.tar.gz hack/artifact-metadata.template.json | bin/metadata

3
make/manifests.mk
View File

@ -35,7 +35,8 @@ bin/release/cert-manager-manifests.tar.gz: bin/cert-manager-$(RELEASE_VERSION).t
mkdir -p bin/scratch/manifests/deploy/manifests/ mkdir -p bin/scratch/manifests/deploy/manifests/
cp bin/cert-manager-$(RELEASE_VERSION).tgz bin/cert-manager-$(RELEASE_VERSION).tgz.prov bin/scratch/manifests/deploy/chart/ cp bin/cert-manager-$(RELEASE_VERSION).tgz bin/cert-manager-$(RELEASE_VERSION).tgz.prov bin/scratch/manifests/deploy/chart/
cp bin/yaml/cert-manager.crds.yaml bin/yaml/cert-manager.yaml bin/scratch/manifests/deploy/manifests/ cp bin/yaml/cert-manager.crds.yaml bin/yaml/cert-manager.yaml bin/scratch/manifests/deploy/manifests/
tar czf $@ -C bin/scratch/manifests . # removes leading ./ from archived paths
find bin/scratch/manifests -maxdepth 1 -mindepth 1 | sed 's|.*/||' | tar czf $@ -C bin/scratch/manifests -T -
rm -rf bin/scratch/manifests rm -rf bin/scratch/manifests
# This metadata blob is constructed slightly differently and doesn't use hack/artifact-metadata.template.json directly; # This metadata blob is constructed slightly differently and doesn't use hack/artifact-metadata.template.json directly;