Skip to content

build: update vulnerability scan #1224

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.

Sign up for GitHub

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

Open
bestbeforetoday wants to merge 1 commit into
base: main
Choose a base branch
from
+35 −15
Open

build: update vulnerability scan #1224

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/pr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ jobs:
- name: Setup Gradle
uses: gradle/actions/setup-gradle@v6.3.0
- name: Scan
run: make component=${{ matrix.project }} scan
run: make scan-${{ matrix.project }}
java:
name: Build and Test Java
runs-on: ubuntu-latest
Expand Down
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ out/**
.pmdCache
gradle.lockfile
settings-gradle.lockfile
osv-scanner

# VS Code ignores
.vscode
Expand Down
47 changes: 33 additions & 14 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,38 @@
OSV_SCANNER_IMAGE := ghcr.io/google/osv-scanner:v2.3.5
COMPONENTS := core isthmus isthmus-cli
SCAN_COMPONENTS := $(addprefix scan-,$(COMPONENTS))

.PHONY: scan
scan:
ifdef component
./gradlew --quiet ':$(component):dependencies' --write-locks --configuration runtimeClasspath
docker run --rm \
--volume './$(component)/gradle.lockfile:/gradle.lockfile' \
--volume './osv-scanner.toml:/osv-scanner.toml' \
$(OSV_SCANNER_IMAGE) scan source --lockfile /gradle.lockfile --config /osv-scanner.toml
else
$(MAKE) component=core scan
$(MAKE) component=isthmus scan
$(MAKE) component=isthmus-cli scan
osv_scanner := ./osv-scanner
kernel_name := $(shell uname -s | tr '[:upper:]' '[:lower:]')

machine_hardware := $(shell uname -m)
ifeq ($(machine_hardware), aarch64)
machine_hardware := arm64
endif
ifeq ($(machine_hardware), x86_64)
machine_hardware := amd64
endif

.PHONY: scan
scan: $(SCAN_COMPONENTS)

.PHONY: $(SCAN_COMPONENTS)
$(SCAN_COMPONENTS): scan-%: $(osv_scanner) %/gradle.lockfile
$(osv_scanner) scan source --lockfile $*/gradle.lockfile --config osv-scanner.toml

$(osv_scanner):
curl --silent --show-error --location --output $(osv_scanner) https://github.com/google/osv-scanner/releases/latest/download/osv-scanner_$(kernel_name)_$(machine_hardware)
chmod u+x $(osv_scanner)

.PHONY: install-osv-scanner
install-osv-scanner: uninstall-osv-scanner $(osv_scanner)

.PHONY: uninstall-osv-scanner
uninstall-osv-scanner:
rm -f $(osv_scanner)

$(addsuffix /gradle.lockfile,$(COMPONENTS)): %/gradle.lockfile:
./gradlew --quiet ':$*:dependencies' --write-locks --configuration runtimeClasspath

.PHONY: clean
clean:
find . -depth 2 -type f -name gradle.lockfile -delete -print
find . -maxdepth 2 -type f -name gradle.lockfile -delete -print
Loading