From 4e232e1012643e38efe5bafb4cfbbede644314a1 Mon Sep 17 00:00:00 2001 From: joe Date: Wed, 13 Aug 2025 16:37:58 -0700 Subject: [PATCH] Fix remaining Forgejo compatibility issues - Update context variables from github.* to forge.* syntax - Simplify matrix strategy to remove unsupported os/rust variables - Standardize runs-on to ubuntu-latest for all jobs - Add summary creation steps for better workflow feedback - Ensure all workflows use pure Forgejo-compatible syntax --- .forgejo/workflows/build.yml | 6 +-- .forgejo/workflows/ci.yml | 57 +++++++++++++++++----------- .forgejo/workflows/test.yml | 6 +-- .forgejo/workflows/update-readme.yml | 6 +-- 4 files changed, 43 insertions(+), 32 deletions(-) diff --git a/.forgejo/workflows/build.yml b/.forgejo/workflows/build.yml index e3d2491c..e6f59171 100644 --- a/.forgejo/workflows/build.yml +++ b/.forgejo/workflows/build.yml @@ -355,9 +355,9 @@ jobs: ## Build Information - **Build Date**: $(date '+%Y-%m-%d %H:%M:%S UTC') - - **Build ID**: ${{ github.run_id }} - - **Commit**: ${{ github.sha }} - - **Branch**: ${{ github.ref_name }} + - **Build ID**: ${{ forge.run_number }} + - **Commit**: ${{ forge.sha }} + - **Branch**: ${{ forge.ref_name }} ## Build Status - **Status**: ✅ SUCCESS diff --git a/.forgejo/workflows/ci.yml b/.forgejo/workflows/ci.yml index b176947f..a16460aa 100644 --- a/.forgejo/workflows/ci.yml +++ b/.forgejo/workflows/ci.yml @@ -19,18 +19,13 @@ jobs: matrix: include: - name: "Debian Stable (x86_64)" - os: ubuntu-22.04 - rust: stable target: x86_64-unknown-linux-gnu - container: debian:latest - name: "Debian Stable (aarch64)" - os: ubuntu-22.04 - rust: stable target: aarch64-unknown-linux-gnu - container: debian:latest - runs-on: ${{ matrix.os }} - container: ${{ matrix.container }} + runs-on: ubuntu-latest + container: + image: debian:latest steps: - name: Checkout code @@ -118,10 +113,16 @@ jobs: cargo clippy --target ${{ matrix.target }} -- -D warnings cargo fmt --target ${{ matrix.target }} -- --check + - name: Create test summary + run: | + echo "Test completed successfully for target: ${{ matrix.target }}" + echo "Test completed successfully! 🎉" + # Security and quality checks security: - runs-on: ubuntu-22.04 - container: debian:latest + runs-on: ubuntu-latest + container: + image: debian:latest steps: - name: Checkout code @@ -187,10 +188,16 @@ jobs: . ~/.cargo/env cargo audit --deny warnings + - name: Create security summary + run: | + echo "Security audit completed successfully!" + echo "Security checks completed! 🎉" + # Performance benchmarking benchmark: - runs-on: ubuntu-22.04 - container: debian:latest + runs-on: ubuntu-latest + container: + image: debian:latest steps: - name: Checkout code @@ -263,8 +270,9 @@ jobs: # Documentation build docs: - runs-on: ubuntu-22.04 - container: debian:latest + runs-on: ubuntu-latest + container: + image: debian:latest steps: - name: Checkout code @@ -337,8 +345,9 @@ jobs: # Debian package build debian-package: - runs-on: ubuntu-22.04 - container: debian:latest + runs-on: ubuntu-latest + container: + image: debian:latest steps: - name: Checkout code @@ -433,8 +442,9 @@ jobs: # Integration testing with real OSTree ostree-integration: - runs-on: ubuntu-22.04 - container: debian:latest + runs-on: ubuntu-latest + container: + image: debian:latest steps: - name: Checkout code @@ -518,8 +528,9 @@ jobs: # Code coverage coverage: - runs-on: ubuntu-22.04 - container: debian:latest + runs-on: ubuntu-latest + container: + image: debian:latest steps: - name: Checkout code @@ -609,9 +620,9 @@ jobs: ## Build Information - **Build Date**: $(date '+%Y-%m-%d %H:%M:%S UTC') - - **Build ID**: ${{ github.run_id }} - - **Commit**: ${{ github.sha }} - - **Branch**: ${{ github.ref_name }} + - **Build ID**: ${{ forge.run_number }} + - **Commit**: ${{ forge.sha }} + - **Branch**: ${{ forge.ref_name }} ## CI Status - **Container**: debian:latest diff --git a/.forgejo/workflows/test.yml b/.forgejo/workflows/test.yml index 95ca665f..c239df04 100644 --- a/.forgejo/workflows/test.yml +++ b/.forgejo/workflows/test.yml @@ -182,9 +182,9 @@ jobs: ## Test Information - **Test Date**: $(date '+%Y-%m-%d %H:%M:%S UTC') - - **Test ID**: ${{ github.run_id }} - - **Commit**: ${{ github.sha }} - - **Branch**: ${{ github.ref_name }} + - **Test ID**: ${{ forge.run_number }} + - **Commit**: ${{ forge.sha }} + - **Branch**: ${{ forge.ref_name }} ## Test Status - **Status**: ✅ SUCCESS diff --git a/.forgejo/workflows/update-readme.yml b/.forgejo/workflows/update-readme.yml index 83aaf69e..96d29ec9 100644 --- a/.forgejo/workflows/update-readme.yml +++ b/.forgejo/workflows/update-readme.yml @@ -60,7 +60,7 @@ jobs: run: | # Get current date and workflow run ID BUILD_DATE=$(date '+%Y-%m-%d %H:%M:%S UTC') - WORKFLOW_RUN_ID=${{ github.event.workflow_run.id }} + WORKFLOW_RUN_ID=${{ forge.run_number }} echo "Updating README with workflow run ID: $WORKFLOW_RUN_ID" @@ -135,7 +135,7 @@ jobs: # Add and commit changes git add README.md - git commit -m "Update README with download links for build ${{ github.event.workflow_run.id }}" + git commit -m "Update README with download links for build ${{ forge.run_number }}" # Push changes git push origin main @@ -150,7 +150,7 @@ jobs: ## Update Information - **Update Date**: $(date '+%Y-%m-%d %H:%M:%S UTC') - - **Triggered by**: Build workflow ${{ github.event.workflow_run.id }} + - **Triggered by**: Build workflow ${{ forge.run_number }} - **Status**: ✅ SUCCESS ## Changes Made