oss/syft
2
0
Fork 0
mirror of https://github.com/anchore/syft.git synced 2026-02-12 10:36:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: update Makefile to remove old signing arch (#1299)

Browse Source
This commit is contained in:
Christopher Angelo Phillips 2022-10-31 14:56:30 -04:00 committed by GitHub
parent edeba9c01c
commit e9fbc38064
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Makefile
View File

@ -279,13 +279,8 @@ snapshot-with-signing: ## Build snapshot release binaries and packages (with dum
echo "dist: $(SNAPSHOTDIR)" > $(TEMPDIR)/goreleaser.yaml echo "dist: $(SNAPSHOTDIR)" > $(TEMPDIR)/goreleaser.yaml
cat .goreleaser.yaml >> $(TEMPDIR)/goreleaser.yaml cat .goreleaser.yaml >> $(TEMPDIR)/goreleaser.yaml
rm -f .github/scripts/apple-signing/log/*.txt
# build release snapshots # build release snapshots
bash -c "$(SNAPSHOT_CMD) --config $(TEMPDIR)/goreleaser.yaml || (cat .github/scripts/apple-signing/log/*.txt && false)" bash -c "$(SNAPSHOT_CMD) --config $(TEMPDIR)/goreleaser.yaml"
# remove the keychain with the trusted self-signed cert automatically
.github/scripts/apple-signing/cleanup.sh
snapshot-docker-assets: # Build snapshot images of docker images that will be published on release snapshot-docker-assets: # Build snapshot images of docker images that will be published on release
$(call title,Building snapshot docker release assets) $(call title,Building snapshot docker release assets)
@ -362,17 +357,12 @@ release: clean-dist CHANGELOG.md
echo "dist: $(DISTDIR)" > $(TEMPDIR)/goreleaser.yaml echo "dist: $(DISTDIR)" > $(TEMPDIR)/goreleaser.yaml
cat .goreleaser.yaml >> $(TEMPDIR)/goreleaser.yaml cat .goreleaser.yaml >> $(TEMPDIR)/goreleaser.yaml
rm -f .github/scripts/apple-signing/log/*.txt
# note: notarization cannot be done in parallel, thus --parallelism 1 # note: notarization cannot be done in parallel, thus --parallelism 1
bash -c "\ bash -c "\
$(RELEASE_CMD) \ $(RELEASE_CMD) \
--config $(TEMPDIR)/goreleaser.yaml \ --config $(TEMPDIR)/goreleaser.yaml \
--parallelism 1 \ --parallelism 1 \
--release-notes <(cat CHANGELOG.md)\ --release-notes <(cat CHANGELOG.md)
|| (cat .github/scripts/apple-signing/log/*.txt && false)"
cat .github/scripts/apple-signing/log/*.txt
# TODO: turn this into a post-release hook # TODO: turn this into a post-release hook
# upload the version file that supports the application version update check (excluding pre-releases) # upload the version file that supports the application version update check (excluding pre-releases)

6
syft/pkg/binary_metadata.go
View File

@ -1,7 +1,7 @@
package pkg package pkg
type BinaryMetadata struct { type BinaryMetadata struct {
Classifier string Classifier string `mapstructure:"Classifier" json:"classifier"`
RealPath string RealPath string `mapstructure:"RealPath" json:"realPath"`
VirtualPath string VirtualPath string `mapstructure:"VirtualPath" json:"virtualPath"`
} }