Skip to content

Commit

Permalink
fix: update Makefile to remove old signing arch (#1299)
Browse files Browse the repository at this point in the history
  • Loading branch information
spiffcs committed Oct 31, 2022
1 parent edeba9c commit e9fbc38
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 15 deletions.
14 changes: 2 additions & 12 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -279,13 +279,8 @@ snapshot-with-signing: ## Build snapshot release binaries and packages (with dum
echo "dist: $(SNAPSHOTDIR)" > $(TEMPDIR)/goreleaser.yaml
cat .goreleaser.yaml >> $(TEMPDIR)/goreleaser.yaml

rm -f .github/scripts/apple-signing/log/*.txt

# build release snapshots
bash -c "$(SNAPSHOT_CMD) --config $(TEMPDIR)/goreleaser.yaml || (cat .github/scripts/apple-signing/log/*.txt && false)"

# remove the keychain with the trusted self-signed cert automatically
.github/scripts/apple-signing/cleanup.sh
bash -c "$(SNAPSHOT_CMD) --config $(TEMPDIR)/goreleaser.yaml"

snapshot-docker-assets: # Build snapshot images of docker images that will be published on release
$(call title,Building snapshot docker release assets)
Expand Down Expand Up @@ -362,17 +357,12 @@ release: clean-dist CHANGELOG.md
echo "dist: $(DISTDIR)" > $(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
bash -c "\
$(RELEASE_CMD) \
--config $(TEMPDIR)/goreleaser.yaml \
--parallelism 1 \
--release-notes <(cat CHANGELOG.md)\
|| (cat .github/scripts/apple-signing/log/*.txt && false)"

cat .github/scripts/apple-signing/log/*.txt
--release-notes <(cat CHANGELOG.md)

# TODO: turn this into a post-release hook
# upload the version file that supports the application version update check (excluding pre-releases)
Expand Down
6 changes: 3 additions & 3 deletions syft/pkg/binary_metadata.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package pkg

type BinaryMetadata struct {
Classifier string
RealPath string
VirtualPath string
Classifier string `mapstructure:"Classifier" json:"classifier"`
RealPath string `mapstructure:"RealPath" json:"realPath"`
VirtualPath string `mapstructure:"VirtualPath" json:"virtualPath"`
}

0 comments on commit e9fbc38

Please sign in to comment.