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

Revert "Add workaround for macos github actions cache issue" #1605

Merged
merged 1 commit into from
Feb 22, 2023

Conversation

wagoodman
Copy link
Contributor

Reverts #1584 since it has been fixed upstream in actions/cache#1110

This reverts commit 0076b19.

Signed-off-by: Alex Goodman <alex.goodman@anchore.com>
@wagoodman wagoodman force-pushed the revert-1584-mac-cache-workaround branch from 2af191f to 9261715 Compare February 22, 2023 19:57
@github-actions
Copy link

github-actions bot commented Feb 22, 2023

Benchmark Test Results

Benchmark results from the latest changes vs base branch
goos: linux
goarch: amd64
pkg: github.com/anchore/syft/test/integration
cpu: Intel(R) Xeon(R) CPU E5-2673 v4 @ 2.30GHz
                                                          │ ./.tmp/benchmark-593b08a.txt │
                                                          │            sec/op            │
ImagePackageCatalogers/alpmdb-cataloger-2                                   17.00m ±  4%
ImagePackageCatalogers/ruby-gemspec-cataloger-2                             1.283m ± 20%
ImagePackageCatalogers/python-package-cataloger-2                           4.428m ±  1%
ImagePackageCatalogers/php-composer-installed-cataloger-2                   1.005m ±  1%
ImagePackageCatalogers/javascript-package-cataloger-2                       574.5µ ±  4%
ImagePackageCatalogers/dpkgdb-cataloger-2                                   806.5µ ±  3%
ImagePackageCatalogers/rpm-db-cataloger-2                                   770.0µ ±  3%
ImagePackageCatalogers/java-cataloger-2                                     15.80m ±  1%
ImagePackageCatalogers/graalvm-native-image-cataloger-2                     12.60µ ±  2%
ImagePackageCatalogers/apkdb-cataloger-2                                    766.8µ ±  3%
ImagePackageCatalogers/go-module-binary-cataloger-2                         27.74µ ±  3%
ImagePackageCatalogers/dotnet-deps-cataloger-2                              1.509m ±  3%
ImagePackageCatalogers/portage-cataloger-2                                  523.9µ ±  5%
ImagePackageCatalogers/sbom-cataloger-2                                     149.6µ ±  3%
ImagePackageCatalogers/binary-cataloger-2                                   203.8µ ±  5%
geomean                                                                     686.3µ

                                                          │ ./.tmp/benchmark-593b08a.txt │
                                                          │             B/op             │
ImagePackageCatalogers/alpmdb-cataloger-2                                   5.061Mi ± 0%
ImagePackageCatalogers/ruby-gemspec-cataloger-2                             141.6Ki ± 0%
ImagePackageCatalogers/python-package-cataloger-2                           947.1Ki ± 0%
ImagePackageCatalogers/php-composer-installed-cataloger-2                   155.8Ki ± 0%
ImagePackageCatalogers/javascript-package-cataloger-2                       95.47Ki ± 0%
ImagePackageCatalogers/dpkgdb-cataloger-2                                   144.5Ki ± 0%
ImagePackageCatalogers/rpm-db-cataloger-2                                   170.1Ki ± 0%
ImagePackageCatalogers/java-cataloger-2                                     2.721Mi ± 0%
ImagePackageCatalogers/graalvm-native-image-cataloger-2                     1.523Ki ± 0%
ImagePackageCatalogers/apkdb-cataloger-2                                    123.0Ki ± 0%
ImagePackageCatalogers/go-module-binary-cataloger-2                         3.102Ki ± 0%
ImagePackageCatalogers/dotnet-deps-cataloger-2                              314.3Ki ± 0%
ImagePackageCatalogers/portage-cataloger-2                                  75.40Ki ± 0%
ImagePackageCatalogers/sbom-cataloger-2                                     13.02Ki ± 0%
ImagePackageCatalogers/binary-cataloger-2                                   20.79Ki ± 0%
geomean                                                                     106.7Ki

                                                          │ ./.tmp/benchmark-593b08a.txt │
                                                          │          allocs/op           │
ImagePackageCatalogers/alpmdb-cataloger-2                                    86.71k ± 0%
ImagePackageCatalogers/ruby-gemspec-cataloger-2                              2.159k ± 0%
ImagePackageCatalogers/python-package-cataloger-2                            15.48k ± 0%
ImagePackageCatalogers/php-composer-installed-cataloger-2                    3.457k ± 0%
ImagePackageCatalogers/javascript-package-cataloger-2                        1.252k ± 0%
ImagePackageCatalogers/dpkgdb-cataloger-2                                    2.646k ± 0%
ImagePackageCatalogers/rpm-db-cataloger-2                                    3.759k ± 0%
ImagePackageCatalogers/java-cataloger-2                                      38.26k ± 0%
ImagePackageCatalogers/graalvm-native-image-cataloger-2                       40.00 ± 0%
ImagePackageCatalogers/apkdb-cataloger-2                                     3.252k ± 0%
ImagePackageCatalogers/go-module-binary-cataloger-2                           101.0 ± 0%
ImagePackageCatalogers/dotnet-deps-cataloger-2                               5.011k ± 0%
ImagePackageCatalogers/portage-cataloger-2                                   1.487k ± 0%
ImagePackageCatalogers/sbom-cataloger-2                                       392.0 ± 0%
ImagePackageCatalogers/binary-cataloger-2                                     627.0 ± 0%
geomean                                                                      2.174k

@wagoodman wagoodman merged commit 669fee8 into main Feb 22, 2023
@wagoodman wagoodman deleted the revert-1584-mac-cache-workaround branch February 22, 2023 20:03
@wagoodman wagoodman added the changelog-ignore Don't include this issue in the release changelog label Feb 22, 2023
noqcks pushed a commit to noqcks/syft that referenced this pull request Feb 23, 2023
…1584)" (anchore#1605)

This reverts commit 0076b19.

Signed-off-by: Alex Goodman <alex.goodman@anchore.com>
noqcks added a commit to noqcks/syft that referenced this pull request Feb 23, 2023
Signed-off-by: Benji Visser <benji@093b.org>

chore: update SPDX license list (anchore#1599)

Update SPDX license list to 3.20 (anchore#1600)

Signed-off-by: Marc-Etienne Vargenau <marc-etienne.vargenau@nokia.com>

Update Stereoscope to 529924d6d5aa6c708cceffc651883b6e1e27f5df (anchore#1602)

Signed-off-by: GitHub <noreply@github.com>

feat: add perl binary classifier (anchore#1592)

Signed-off-by: Benji Visser <benji@093b.org>

chore: update syft bootstrap tools to latest versions. (anchore#1593)

fix: issue when matching format versions (anchore#1585)

Signed-off-by: Keith Zantow <kzantow@gmail.com>

fix: merging of binary packages (anchore#1583)

chore: fix cataloger_test (anchore#1603)

Signed-off-by: Keith Zantow <kzantow@gmail.com>

Update Stereoscope to fab1c9638abc2c21cd53dca1f205f37d71148ee0 (anchore#1604)

Signed-off-by: GitHub <noreply@github.com>
Co-authored-by: wagoodman <wagoodman@users.noreply.github.com>

Revert "add workaround for macos github actions cache issue (anchore#1584)" (anchore#1605)

This reverts commit 0076b19.

Signed-off-by: Alex Goodman <alex.goodman@anchore.com>

remove schema 6.2.1

Signed-off-by: Benji Visser <benji@093b.org>
GijsCalis pushed a commit to GijsCalis/syft that referenced this pull request Feb 19, 2024
…1584)" (anchore#1605)

This reverts commit da0c8ed.

Signed-off-by: Alex Goodman <alex.goodman@anchore.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
changelog-ignore Don't include this issue in the release changelog
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants