Merge pull request #112 from awslabs/fix/workflow-failures

fgogolli · web-flow · commit 9829ce8ae84c · 2026-01-21T14:18:11.000+01:00
fix: resolve workflow failures in SBOM, Advanced Metrics, Pages, and Manifests
diff --git a/.github/actions/setup-uv-fresh/action.yml b/.github/actions/setup-uv-fresh/action.yml
@@ -1,5 +1,5 @@
-name: 'Setup Python and UV'
-description: 'Setup Python, UV, generate pyproject.toml, and install dependencies'
+name: 'Setup UV Fresh'
+description: 'Setup Python, UV, generate pyproject.toml, and install dependencies from scratch'
 inputs:
   python-version:
     description: 'Python version to setup'
diff --git a/.github/workflows/advanced-metrics.yml b/.github/workflows/advanced-metrics.yml
@@ -18,9 +18,18 @@ jobs:
     name: Configuration
     uses: ./.github/workflows/shared-config.yml
 
+  setup-cache:
+    name: Setup Cache
+    needs: config
+    uses: ./.github/workflows/cache-management.yml
+    with:
+      cache-type: dependencies
+      cache-key-base: metrics-deps
+      python-version: ${{ needs.config.outputs.default-python-version }}
+
   metrics:
     name: Generate Advanced Metrics
-    needs: config
+    needs: [config, setup-cache]
     runs-on: ubuntu-latest
     permissions:
       contents: read
@@ -30,15 +39,11 @@ jobs:
     - name: Checkout code
       uses: actions/checkout@v6.0.1
 
-    - name: Set up Python
-      uses: actions/setup-python@v5
-      with:
-        python-version: ${{ needs.config.outputs.default-python-version }}
-
-    - name: Cache management
-      uses: ./.github/workflows/cache-management.yml
+    - name: Setup Python and UV
+      uses: ./.github/actions/setup-uv-cached
       with:
-        python-version: ${{ needs.config.outputs.default-python-version }}
+        cache-key: ${{ needs.setup-cache.outputs.cache-key }}
+        fail-on-cache-miss: false
 
     - name: Install dependencies
       run: |
diff --git a/.github/workflows/changelog-validation.yml b/.github/workflows/changelog-validation.yml
@@ -11,7 +11,7 @@ on:
   workflow_dispatch:
 
 jobs:
-  get-config:
+  config:
     name: Get Configuration
     runs-on: ubuntu-latest
     permissions:
@@ -27,17 +27,17 @@ jobs:
 
   setup-cache:
     name: Setup Cache
-    needs: get-config
+    needs: config
     uses: ./.github/workflows/cache-management.yml
     with:
       cache-type: dependencies
       cache-key-base: changelog-validation
-      python-version: ${{ needs.get-config.outputs.default-python-version }}
+      python-version: ${{ needs.config.outputs.default-python-version }}
 
   validate-changelog:
     name: Validate Changelog Format
     runs-on: ubuntu-latest
-    needs: [get-config, setup-cache]
+    needs: [config, setup-cache]
     permissions:
       contents: read
     
diff --git a/.github/workflows/ci-quality.yml b/.github/workflows/ci-quality.yml
@@ -52,7 +52,7 @@ jobs:
         fetch-depth: 0
     
     - name: Setup Python and UV
-      uses: ./.github/actions/setup-python-uv
+      uses: ./.github/actions/setup-uv-fresh
       with:
         python-version: ${{ needs.config.outputs.default-python-version }}
         cache-key-suffix: quality
diff --git a/.github/workflows/dependabot.yml b/.github/workflows/dependabot.yml
@@ -13,7 +13,7 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  get-config:
+  config:
     name: Get Configuration
     runs-on: ubuntu-latest
     outputs:
@@ -28,18 +28,18 @@ jobs:
 
   setup-cache:
     name: Setup Cache
-    needs: get-config
+    needs: config
     uses: ./.github/workflows/cache-management.yml
     with:
       cache-type: dependencies
       cache-key-base: dependabot
-      python-version: ${{ needs.get-config.outputs.default-python-version }}
+      python-version: ${{ needs.config.outputs.default-python-version }}
 
   update-uv-lock:
     name: Update UV Lock File
     if: github.actor == 'dependabot[bot]' && github.event_name == 'pull_request'
     runs-on: ubuntu-latest
-    needs: [get-config, setup-cache]
+    needs: [config, setup-cache]
     permissions:
       contents: write
       pull-requests: write
@@ -179,7 +179,7 @@ jobs:
     name: Monthly Maintenance
     if: github.event_name == 'schedule' || github.event_name == 'workflow_dispatch'
     runs-on: ubuntu-latest
-    needs: [get-config, setup-cache]
+    needs: [config, setup-cache]
     permissions:
       contents: write
       pull-requests: write
diff --git a/.github/workflows/dev-pypi.yml b/.github/workflows/dev-pypi.yml
@@ -39,7 +39,7 @@ concurrency:
   cancel-in-progress: false
 
 jobs:
-  get-config:
+  config:
     name: Get Configuration
     runs-on: ubuntu-latest
     if: github.event_name != 'workflow_run' || github.event.workflow_run.conclusion == 'success'
@@ -58,10 +58,10 @@ jobs:
   publish:
     name: Build and Publish Package
     runs-on: ubuntu-latest
-    needs: [get-config]
+    needs: [config]
     environment:
       name: testpypi
-      url: https://test.pypi.org/p/${{ needs.get-config.outputs.pypi-name }}
+      url: https://test.pypi.org/p/${{ needs.config.outputs.pypi-name }}
     permissions:
       id-token: write  # IMPORTANT: mandatory for trusted publishing
       contents: read   # needed to checkout code
@@ -75,15 +75,15 @@ jobs:
     - name: Determine version and target
       run: |
         {
-          echo "VERSION=${{ needs.get-config.outputs.package-version }}"
+          echo "VERSION=${{ needs.config.outputs.package-version }}"
           echo "TARGET=testpypi"
         } >> "$GITHUB_ENV"
         echo "Publishing to: TestPyPI with version: $VERSION"
 
     - name: Setup Python and UV
       uses: ./.github/actions/setup-uv-cached
       with:
-        cache-key: deps-${{ needs.get-config.outputs.default-python-version }}-${{ hashFiles('.project.yml', 'pyproject.toml', 'requirements*.txt') }}
+        cache-key: deps-${{ needs.config.outputs.default-python-version }}-${{ hashFiles('.project.yml', 'pyproject.toml', 'requirements*.txt') }}
         fail-on-cache-miss: false
 
     - name: Build package
@@ -107,7 +107,7 @@ jobs:
           echo "## Package Published Successfully"
           echo ""
           echo "**Environment:** Test PyPI"
-          echo "**Installation:** \`pip install --index-url https://test.pypi.org/simple/ ${{ needs.get-config.outputs.pypi-name }}\`"
+          echo "**Installation:** \`pip install --index-url https://test.pypi.org/simple/ ${{ needs.config.outputs.pypi-name }}\`"
           echo ""
           echo "**Version:** $VERSION"
           echo "**Commands:**"
@@ -117,7 +117,7 @@ jobs:
   generate-sbom:
     name: Generate SBOM
     runs-on: ubuntu-latest
-    needs: [get-config, publish]
+    needs: [config, publish]
 
     permissions:
       contents: read
@@ -131,7 +131,7 @@ jobs:
     - name: Setup Python and UV
       uses: ./.github/actions/setup-uv-cached
       with:
-        cache-key: deps-${{ needs.get-config.outputs.default-python-version }}-${{ hashFiles('.project.yml', 'pyproject.toml', 'requirements*.txt') }}
+        cache-key: deps-${{ needs.config.outputs.default-python-version }}-${{ hashFiles('.project.yml', 'pyproject.toml', 'requirements*.txt') }}
         fail-on-cache-miss: false
 
     - name: Generate SBOM files
@@ -141,7 +141,7 @@ jobs:
     - name: Upload SBOM artifacts
       uses: actions/upload-artifact@v4
       with:
-        name: reports-sbom-${{ needs.get-config.outputs.package-version }}
+        name: reports-sbom-${{ needs.config.outputs.package-version }}
         path: |
           python-sbom-cyclonedx.json
           python-sbom-spdx.json
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -34,7 +34,7 @@ concurrency:
   cancel-in-progress: false
 
 jobs:
-  get-config:
+  config:
     name: Get Configuration
     runs-on: ubuntu-latest
     outputs:
@@ -48,15 +48,15 @@ jobs:
 
   setup-cache:
     name: Setup Cache
-    needs: get-config
+    needs: config
     uses: ./.github/workflows/cache-management.yml
     with:
       cache-type: dependencies
       cache-key-base: docs-deps
-      python-version: ${{ needs.get-config.outputs.default-python-version }}
+      python-version: ${{ needs.config.outputs.default-python-version }}
 
   build:
-    needs: [get-config, setup-cache]
+    needs: [config, setup-cache]
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
diff --git a/.github/workflows/prod-release.yml b/.github/workflows/prod-release.yml
@@ -21,7 +21,7 @@ concurrency:
   cancel-in-progress: false
 
 jobs:
-  get-config:
+  config:
     name: Get Configuration
     runs-on: ubuntu-latest
     outputs:
@@ -42,14 +42,14 @@ jobs:
 
   prod-containers:
     name: Build Production Containers
-    needs: get-config
+    needs: config
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ${{ fromJSON(needs.get-config.outputs.python-versions) }}
+        python-version: ${{ fromJSON(needs.config.outputs.python-versions) }}
     
     env:
-      SCAN_LEVEL: ${{ matrix.python-version == needs.get-config.outputs.default-python-version && 'full' || 'basic' }}
+      SCAN_LEVEL: ${{ matrix.python-version == needs.config.outputs.default-python-version && 'full' || 'basic' }}
       PUSH_TO_REGISTRY: true
 
     permissions:
@@ -69,26 +69,26 @@ jobs:
     - name: Log in to Container Registry
       uses: docker/login-action@v3
       with:
-        registry: ${{ needs.get-config.outputs.container-registry }}
+        registry: ${{ needs.config.outputs.container-registry }}
         username: ${{ github.actor }}
         password: ${{ secrets.GITHUB_TOKEN }}
 
     - name: Setup Python and UV
       uses: ./.github/actions/setup-uv-cached
       with:
-        cache-key: prod-${{ needs.get-config.outputs.package-version }}-py${{ matrix.python-version }}
+        cache-key: prod-${{ needs.config.outputs.package-version }}-py${{ matrix.python-version }}
         fail-on-cache-miss: false
 
     - name: Build package wheel
       run: make build
 
     - name: Build and scan container image
       env:
-        REGISTRY: ${{ needs.get-config.outputs.container-registry }}
-        IMAGE_NAME: ${{ needs.get-config.outputs.container-image }}
-        VERSION: ${{ needs.get-config.outputs.package-version }}
+        REGISTRY: ${{ needs.config.outputs.container-registry }}
+        IMAGE_NAME: ${{ needs.config.outputs.container-image }}
+        VERSION: ${{ needs.config.outputs.package-version }}
         PYTHON_VERSION: ${{ matrix.python-version }}
-        DEFAULT_PYTHON: ${{ needs.get-config.outputs.default-python-version }}
+        DEFAULT_PYTHON: ${{ needs.config.outputs.default-python-version }}
       run: |
         make container single push \
           REGISTRY="$REGISTRY" \
@@ -98,7 +98,7 @@ jobs:
 
   prod-manifests:
     name: Create Production Manifests
-    needs: [get-config, prod-containers]
+    needs: [config, prod-containers]
     runs-on: ubuntu-latest
     permissions:
       contents: read
@@ -111,20 +111,20 @@ jobs:
     - name: Log in to Container Registry
       uses: docker/login-action@v3
       with:
-        registry: ${{ needs.get-config.outputs.container-registry }}
+        registry: ${{ needs.config.outputs.container-registry }}
         username: ${{ github.actor }}
         password: ${{ secrets.GITHUB_TOKEN }}
 
     - name: Create production tag manifests
       env:
-        REGISTRY: ${{ needs.get-config.outputs.container-registry }}
-        IMAGE: ${{ needs.get-config.outputs.container-image }}
-        VERSION: ${{ needs.get-config.outputs.package-version }}
-        DEFAULT_PYTHON: ${{ needs.get-config.outputs.default-python-version }}
+        REGISTRY: ${{ needs.config.outputs.container-registry }}
+        IMAGE: ${{ needs.config.outputs.container-image }}
+        VERSION: ${{ needs.config.outputs.package-version }}
+        DEFAULT_PYTHON: ${{ needs.config.outputs.default-python-version }}
         IS_RELEASE: "true"
       run: |
-        # Get tags from calculation script
-        eval "$(make get-container-tags)"
+        # Get tags from Makefile target
+        eval "$(make get-container-tags-env)"
         
         # Create primary tags (latest, version)
         if [[ -n "$primary_tags" ]]; then
@@ -151,7 +151,7 @@ jobs:
 
   prod-pypi:
     name: Publish to PyPI
-    needs: get-config
+    needs: config
     runs-on: ubuntu-latest
     environment: pypi
     permissions:
@@ -165,7 +165,7 @@ jobs:
     - name: Setup Python and UV
       uses: ./.github/actions/setup-uv-cached
       with:
-        cache-key: prod-pypi-${{ needs.get-config.outputs.package-version }}
+        cache-key: prod-pypi-${{ needs.config.outputs.package-version }}
         fail-on-cache-miss: false
 
     - name: Build package
@@ -179,8 +179,11 @@ jobs:
 
   prod-docs:
     name: Deploy Production Documentation
-    needs: get-config
+    needs: config
     runs-on: ubuntu-latest
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
     permissions:
       contents: read
       pages: write
@@ -193,7 +196,7 @@ jobs:
     - name: Setup Python and UV
       uses: ./.github/actions/setup-uv-cached
       with:
-        cache-key: prod-docs-${{ needs.get-config.outputs.package-version }}
+        cache-key: prod-docs-${{ needs.config.outputs.package-version }}
         fail-on-cache-miss: false
 
     - name: Build documentation
@@ -211,7 +214,7 @@ jobs:
 
   github-assets:
     name: Upload GitHub Release Assets
-    needs: [get-config, prod-containers, prod-pypi]
+    needs: [config, prod-containers, prod-pypi]
     runs-on: ubuntu-latest
     permissions:
       contents: write
@@ -223,7 +226,7 @@ jobs:
     - name: Setup Python and UV
       uses: ./.github/actions/setup-uv-cached
       with:
-        cache-key: prod-assets-${{ needs.get-config.outputs.package-version }}
+        cache-key: prod-assets-${{ needs.config.outputs.package-version }}
         fail-on-cache-miss: false
 
     - name: Build package
@@ -236,7 +239,7 @@ jobs:
       env:
         GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       run: |
-        VERSION="${{ needs.get-config.outputs.package-version }}"
+        VERSION="${{ needs.config.outputs.package-version }}"
         RELEASE_TAG="v$VERSION"
         
         # Upload wheel and source distribution
diff --git a/.github/workflows/test-matrix.yml b/.github/workflows/test-matrix.yml
diff --git a/.github/workflows/validate-workflows.yml b/.github/workflows/validate-workflows.yml
diff --git a/dev-tools/scripts/install_dev_tools.py b/dev-tools/scripts/install_dev_tools.py
diff --git a/makefiles/deploy.mk b/makefiles/deploy.mk
