oss/syft
2
0
Fork 0
mirror of https://github.com/anchore/syft.git synced 2025-11-17 08:23:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: update cache.fingerprint file to java-builds dir (#1748)

Browse Source 
Signed-off-by: Christopher Phillips <christopher.phillips@anchore.com>
This commit is contained in:
Christopher Angelo Phillips 2023-04-19 12:17:07 -04:00 committed by GitHub
parent 6e835fd8fc
commit 55a90a2ee0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/validations.yaml vendored
View File

@ -36,8 +36,8 @@ jobs:
- name: Restore Java test-fixture cache - name: Restore Java test-fixture cache
uses: actions/cache@v3 uses: actions/cache@v3
with: with:
path: syft/pkg/cataloger/java/test-fixtures/java-builds/packages path: syft/pkg/cataloger/java/test-fixtures/java-builds
key: ${{ runner.os }}-unit-java-cache-${{ hashFiles( 'syft/pkg/cataloger/java/test-fixtures/java-builds/packages.fingerprint' ) }} key: ${{ runner.os }}-unit-java-cache-${{ hashFiles( 'syft/pkg/cataloger/java/test-fixtures/java-builds/cache.fingerprint' ) }}
- name: Restore RPM test-fixture cache - name: Restore RPM test-fixture cache
uses: actions/cache@v3 uses: actions/cache@v3

2
Makefile
View File

@ -199,7 +199,7 @@ fingerprints:
# for JAVA BUILD test fixtures # for JAVA BUILD test fixtures
cd syft/pkg/cataloger/java/test-fixtures/java-builds && \ cd syft/pkg/cataloger/java/test-fixtures/java-builds && \
make packages.fingerprint make cache.fingerprint
# for GO BINARY test fixtures # for GO BINARY test fixtures
cd syft/pkg/cataloger/golang/test-fixtures/archs && \ cd syft/pkg/cataloger/golang/test-fixtures/archs && \

8
syft/pkg/cataloger/java/test-fixtures/java-builds/Makefile
View File

@ -72,7 +72,7 @@ $(PKGSDIR)/gcc-amd64-darwin-exec-debug:
./build-example-macho-binary.sh $(PKGSDIR) ./build-example-macho-binary.sh $(PKGSDIR)
# we need a way to determine if CI should bust the test cache based on the source material # we need a way to determine if CI should bust the test cache based on the source material
$(PKGSDIR).fingerprint: clean-examples .PHONY: cache.fingerprint
mkdir -p $(PKGSDIR) cache.fingerprint:
find example-* build-* Makefile -type f -exec sha256sum {} \; | sort | tee /dev/stderr | tee $(PKGSDIR).fingerprint find example-* build-* Makefile -type f -exec sha256sum {} \; | sort | tee /dev/stderr | tee cache.fingerprint
sha256sum $(PKGSDIR).fingerprint sha256sum cache.fingerprint