Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: update Makefile to remove old signing arch #1299

Merged
merged 2 commits into from
Oct 31, 2022
Merged

Conversation

spiffcs
Copy link
Contributor

@spiffcs spiffcs commented Oct 31, 2022

Summary

Our old apple signing architecture was still present in some of the Makefile release scripts.

This PR allows the CI flow to not block on the presence of log files that no longer exist.

Users should be able to run make make snapshot-with-signing with status code 0 and the build artifacts located in snaoshot

For more context on the error and the lines removed to fix this error see this build log:
https://github.com/anchore/syft/actions/runs/3363098999/jobs/5576370179

Signed-off-by: Christopher Phillips christopher.phillips@anchore.com

Signed-off-by: Christopher Phillips <christopher.phillips@anchore.com>
@spiffcs spiffcs enabled auto-merge (squash) October 31, 2022 18:19
@github-actions
Copy link

github-actions bot commented Oct 31, 2022

Benchmark Test Results

Benchmark results from the latest changes vs base branch
name                                                       old time/op    new time/op    delta
ImagePackageCatalogers/alpmdb-cataloger-2                    11.2ms ± 0%    11.6ms ± 1%   +4.23%  (p=0.008 n=5+5)
ImagePackageCatalogers/ruby-gemspec-cataloger-2              1.27ms ± 0%    1.39ms ± 6%   +9.74%  (p=0.016 n=4+5)
ImagePackageCatalogers/python-package-cataloger-2            3.19ms ± 0%    3.39ms ± 1%   +5.98%  (p=0.008 n=5+5)
ImagePackageCatalogers/php-composer-installed-cataloger-2    1.02ms ± 1%    1.09ms ± 1%   +7.01%  (p=0.008 n=5+5)
ImagePackageCatalogers/javascript-package-cataloger-2         710µs ± 1%     750µs ± 0%   +5.72%  (p=0.008 n=5+5)
ImagePackageCatalogers/node-binary-cataloger-2               6.82µs ± 1%    6.65µs ± 1%   -2.43%  (p=0.008 n=5+5)
ImagePackageCatalogers/dpkgdb-cataloger-2                     819µs ± 1%     885µs ± 1%   +8.02%  (p=0.008 n=5+5)
ImagePackageCatalogers/rpm-db-cataloger-2                    1.19ms ± 1%    1.29ms ± 0%   +8.53%  (p=0.008 n=5+5)
ImagePackageCatalogers/java-cataloger-2                      13.8ms ± 0%    14.6ms ± 1%   +6.11%  (p=0.008 n=5+5)
ImagePackageCatalogers/apkdb-cataloger-2                     1.21ms ± 2%    1.33ms ± 3%  +10.41%  (p=0.008 n=5+5)
ImagePackageCatalogers/go-module-binary-cataloger-2          6.82µs ± 0%    6.60µs ± 2%   -3.18%  (p=0.008 n=5+5)
ImagePackageCatalogers/dotnet-deps-cataloger-2               1.33ms ± 2%    1.40ms ± 0%   +5.37%  (p=0.008 n=5+5)
ImagePackageCatalogers/portage-cataloger-2                    656µs ± 0%     715µs ± 0%   +9.00%  (p=0.008 n=5+5)

name                                                       old alloc/op   new alloc/op   delta
ImagePackageCatalogers/alpmdb-cataloger-2                    5.27MB ± 0%    5.27MB ± 0%   -0.06%  (p=0.016 n=5+5)
ImagePackageCatalogers/ruby-gemspec-cataloger-2               204kB ± 0%     204kB ± 0%     ~     (p=0.151 n=5+5)
ImagePackageCatalogers/python-package-cataloger-2             961kB ± 0%     960kB ± 0%   -0.10%  (p=0.032 n=5+5)
ImagePackageCatalogers/php-composer-installed-cataloger-2     217kB ± 0%     216kB ± 0%     ~     (p=0.063 n=5+5)
ImagePackageCatalogers/javascript-package-cataloger-2         159kB ± 0%     159kB ± 0%     ~     (p=0.421 n=5+5)
ImagePackageCatalogers/node-binary-cataloger-2               1.12kB ± 0%    1.12kB ± 0%     ~     (all equal)
ImagePackageCatalogers/dpkgdb-cataloger-2                     200kB ± 0%     200kB ± 0%     ~     (p=0.548 n=5+5)
ImagePackageCatalogers/rpm-db-cataloger-2                     302kB ± 0%     302kB ± 0%     ~     (p=0.095 n=5+5)
ImagePackageCatalogers/java-cataloger-2                      3.45MB ± 0%    3.45MB ± 0%     ~     (p=0.690 n=5+5)
ImagePackageCatalogers/apkdb-cataloger-2                     1.25MB ± 0%    1.25MB ± 0%     ~     (p=0.841 n=5+5)
ImagePackageCatalogers/go-module-binary-cataloger-2          1.12kB ± 0%    1.12kB ± 0%     ~     (all equal)
ImagePackageCatalogers/dotnet-deps-cataloger-2                379kB ± 0%     378kB ± 0%   -0.07%  (p=0.016 n=5+5)
ImagePackageCatalogers/portage-cataloger-2                    138kB ± 0%     138kB ± 0%     ~     (p=1.000 n=5+5)

name                                                       old allocs/op  new allocs/op  delta
ImagePackageCatalogers/alpmdb-cataloger-2                     85.7k ± 0%     85.7k ± 0%     ~     (p=0.167 n=5+5)
ImagePackageCatalogers/ruby-gemspec-cataloger-2               4.24k ± 0%     4.24k ± 0%     ~     (all equal)
ImagePackageCatalogers/python-package-cataloger-2             16.5k ± 0%     16.5k ± 0%     ~     (p=0.762 n=5+5)
ImagePackageCatalogers/php-composer-installed-cataloger-2     5.51k ± 0%     5.51k ± 0%     ~     (p=0.365 n=5+5)
ImagePackageCatalogers/javascript-package-cataloger-2         3.31k ± 0%     3.31k ± 0%     ~     (all equal)
ImagePackageCatalogers/node-binary-cataloger-2                 38.0 ± 0%      38.0 ± 0%     ~     (all equal)
ImagePackageCatalogers/dpkgdb-cataloger-2                     4.51k ± 0%     4.51k ± 0%     ~     (all equal)
ImagePackageCatalogers/rpm-db-cataloger-2                     8.11k ± 0%     8.11k ± 0%     ~     (all equal)
ImagePackageCatalogers/java-cataloger-2                       57.5k ± 0%     57.5k ± 0%     ~     (p=0.738 n=5+5)
ImagePackageCatalogers/apkdb-cataloger-2                      5.39k ± 0%     5.39k ± 0%     ~     (p=1.000 n=4+5)
ImagePackageCatalogers/go-module-binary-cataloger-2            38.0 ± 0%      38.0 ± 0%     ~     (all equal)
ImagePackageCatalogers/dotnet-deps-cataloger-2                7.33k ± 0%     7.33k ± 0%     ~     (all equal)
ImagePackageCatalogers/portage-cataloger-2                    3.58k ± 0%     3.58k ± 0%     ~     (all equal)

@spiffcs spiffcs disabled auto-merge October 31, 2022 18:22
Signed-off-by: Christopher Phillips <christopher.phillips@anchore.com>
Copy link
Contributor

@kzantow kzantow left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Still 👍

@spiffcs spiffcs enabled auto-merge (squash) October 31, 2022 18:27
@spiffcs spiffcs merged commit e9fbc38 into main Oct 31, 2022
@spiffcs spiffcs deleted the makefile-release-updates branch October 31, 2022 18:56
GijsCalis pushed a commit to GijsCalis/syft that referenced this pull request Feb 19, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants