Skip to content

Commit b6585ec

Browse files
committed
fix: resolve workflow failures in SBOM, Advanced Metrics, Pages, and Manifests
- SBOM: Remove invalid capture_output parameter from _run_command call - Advanced Metrics: Use cache-management reusable workflow at job level (consistent with other workflows) - Pages: Add required github-pages environment configuration - Manifests: Add get-container-tags-env Makefile target to export variables
1 parent 737d29c commit b6585ec

4 files changed

Lines changed: 23 additions & 12 deletions

File tree

.github/workflows/advanced-metrics.yml

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,18 @@ jobs:
1818
name: Configuration
1919
uses: ./.github/workflows/shared-config.yml
2020

21+
setup-cache:
22+
name: Setup Cache
23+
needs: config
24+
uses: ./.github/workflows/cache-management.yml
25+
with:
26+
cache-type: dependencies
27+
cache-key-base: metrics-deps
28+
python-version: ${{ needs.config.outputs.default-python-version }}
29+
2130
metrics:
2231
name: Generate Advanced Metrics
23-
needs: config
32+
needs: [config, setup-cache]
2433
runs-on: ubuntu-latest
2534
permissions:
2635
contents: read
@@ -30,15 +39,11 @@ jobs:
3039
- name: Checkout code
3140
uses: actions/checkout@v6.0.1
3241

33-
- name: Set up Python
34-
uses: actions/setup-python@v5
35-
with:
36-
python-version: ${{ needs.config.outputs.default-python-version }}
37-
38-
- name: Cache management
39-
uses: ./.github/workflows/cache-management.yml
42+
- name: Setup Python and UV
43+
uses: ./.github/actions/setup-uv-cached
4044
with:
41-
python-version: ${{ needs.config.outputs.default-python-version }}
45+
cache-key: ${{ needs.setup-cache.outputs.cache-key }}
46+
fail-on-cache-miss: false
4247

4348
- name: Install dependencies
4449
run: |

.github/workflows/prod-release.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,8 +123,8 @@ jobs:
123123
DEFAULT_PYTHON: ${{ needs.get-config.outputs.default-python-version }}
124124
IS_RELEASE: "true"
125125
run: |
126-
# Get tags from calculation script
127-
eval "$(make get-container-tags)"
126+
# Get tags from Makefile target
127+
eval "$(make get-container-tags-env)"
128128
129129
# Create primary tags (latest, version)
130130
if [[ -n "$primary_tags" ]]; then
@@ -181,6 +181,9 @@ jobs:
181181
name: Deploy Production Documentation
182182
needs: get-config
183183
runs-on: ubuntu-latest
184+
environment:
185+
name: github-pages
186+
url: ${{ steps.deployment.outputs.page_url }}
184187
permissions:
185188
contents: read
186189
pages: write

dev-tools/scripts/install_dev_tools.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -433,7 +433,7 @@ def _install_act_generic(self):
433433
def _install_pip_audit_python(self):
434434
"""Install pip-audit using Python package manager."""
435435
# Try uv first, fall back to pip
436-
if self._run_command(["uv", "--version"], capture_output=True):
436+
if self._run_command(["uv", "--version"]):
437437
return self._run_command(["uv", "tool", "install", "pip-audit"])
438438
else:
439439
return self._run_command(["pip", "install", "--user", "pip-audit"])

makefiles/deploy.mk

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,9 @@ get-version: ## Generate unified version (works for PyPI, Docker, Git)
145145
get-container-tags: ## Calculate container tags for current context
146146
@./dev-tools/container/calculate_tags.sh
147147

148+
get-container-tags-env: ## Export container tags as environment variables
149+
@./dev-tools/container/calculate_tags.sh | sed 's/^/export /'
150+
148151
version-bump: ## Show version bump help
149152
@echo "Version Management Commands:"
150153
@echo " make version-show - Show current version"

0 commit comments

Comments
 (0)