Skip to content

Commit c45f93f

Browse files
committed
chore: update Trivy version handling and add .trivyversion file
Signed-off-by: Adilhusain Shaikh <Adilhusain.Shaikh@ibm.com>
1 parent b5b82ac commit c45f93f

4 files changed

Lines changed: 30 additions & 4 deletions

File tree

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
# Release filter configuration for release-matching-python-tags workflow
2+
# Format: YAML with version and release_types
3+
4+
# Example 1: Only stable releases of 3.14
5+
# version: 3.14.*
6+
# release_types: [stable]
7+
8+
# Example 2: Multiple versions with different release types
9+
# - version: 3.14.*
10+
# release_types: [stable, beta]
11+
# - version: 3.13.*
12+
# release_types: [stable]
13+
14+
# Example 3: All release types (using YAML array syntax)
15+
# version: 3.14.*
16+
# release_types:
17+
# - stable
18+
# - beta
19+
# - rc
20+
# - alpha
21+
22+
# Current configuration:
23+
version: 3.15.*
24+
release_types: [alpha, beta]

.trivyversion

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
v0.70.0

Makefile

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,12 @@ endif
1717

1818
# Versioning
1919
PYTHON_VERSION ?= 3.13.3
20-
ACTIONS_PYTHON_VERSIONS ?= 3.15.0-alpha.5-21016111327
20+
ACTIONS_PYTHON_VERSIONS ?= 3.13.3-14344076652
2121
POWERSHELL_VERSION ?= v7.5.2
2222
POWERSHELL_NATIVE_VERSION ?= v7.4.0
2323
UBUNTU_VERSION ?= 24.04
24-
TRIVY_VERSION ?= v0.70.0
24+
TRIVY_VERSION_FILE ?= .trivyversion
25+
TRIVY_VERSION ?= $(strip $(shell if [ -f "$(TRIVY_VERSION_FILE)" ]; then cat "$(TRIVY_VERSION_FILE)"; else echo v0.70.0; fi))
2526

2627
# Security Gates (0 = Log Only, 1 = Fail Build)
2728
FAIL_ON_CRITICAL ?= 1
@@ -139,7 +140,7 @@ verify-gate:
139140
verify-trivy-version:
140141
@echo "--- Verifying Trivy release $(TRIVY_VERSION) ---"
141142
@curl -fsSL "https://api.github.com/repos/aquasecurity/trivy/releases/tags/$(TRIVY_VERSION)" >/dev/null || \
142-
(echo "ERROR: Trivy release $(TRIVY_VERSION) not found. Set a valid TRIVY_VERSION (e.g. v0.69.2)." && exit 1)
143+
(echo "ERROR: Trivy release $(TRIVY_VERSION) not found. Set a valid TRIVY_VERSION (or update .trivyversion, e.g. v0.70.0)." && exit 1)
143144

144145
verify-trivy-checksums:
145146
@echo "--- Verifying pinned Trivy checksums for $(TRIVY_VERSION) ---"

python-versions/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ ARG BASE_IMAGE=powershell:ubuntu-${UBUNTU_VERSION}
44
ARG TARGETARCH
55
ARG PYTHON_VERSION=3.13.3
66
ARG ACTIONS_PYTHON_VERSIONS=3.13.3-14344076652
7-
ARG TRIVY_VERSION=v0.70.0
7+
ARG TRIVY_VERSION=v0.70.0 # default should match .trivyversion in repo root
88

99
# ================= BUILDER STAGE =====================
1010
FROM ${BASE_IMAGE} AS builder

0 commit comments

Comments
 (0)