Merge branch 'frawhide' into gil/feat/gpg-update-script

.github/PULL_REQUEST_TEMPLATE/new_package.md

@@ -6,3 +6,10 @@ A clear and concise description of why you want this package. Would this provide
 
 **Additional context**
 Add any other context about the package submission here. Link to any relavent issues.
+
+**Checklist**
+- [] This package is maintained OR there is a valid reason to add it (e.g. python dependency)
+- [] I have tested at least the `x86_64` version of the package
+- [] I have read through any relevant [Terra](https://developer.fyralabs.com/terra) and [Fedora packaging](https://docs.fedoraproject.org/en-US/packaging-guidelines/) documentation/policies/guidelines
+- [] I have made sure there are no security issues with this package to the best of my ability
+- [] I have made sure this is not in Fedora (unless adding to the [extras repo](https://developer.fyralabs.com/terra/installing#extras)).

.github/scripts/configure-sccache.js

@@ -6,7 +6,7 @@
 // Note: ACTIONS_CACHE_SERVICE_V2 and SCCACHE_GHA_ENABLED are set at workflow level
 module.exports = async ({ github, context, core, exec }) => {
   // Find sccache path (try which command)
-  let sccachePath = "sccache";
+  let sccachePath = "/usr/bin/sccache";
   try {
     const result = await exec.getExecOutput("which", ["sccache"], {
       ignoreReturnCode: true,
@@ -31,6 +31,13 @@ module.exports = async ({ github, context, core, exec }) => {
     core.warning(`Could not get sccache version: ${e.message}`);
   }
 
+  // Enable caching
+  core.exportVariable("RUSTC_WRAPPER", sccachePath);
+  core.exportVariable("SCCACHE_GHA_ENABLED", "true");
+
+  // Disable Cargo incremental builds to not interfere with caching
+  core.exportVariable("CARGO_INCREMENTAL", "false");
+  
   // Debug: Show what environment variables are available
   core.info("=== Environment Variables Diagnostic ===");
   core.info(`SCCACHE_GHA_ENABLED: ${process.env.SCCACHE_GHA_ENABLED}`);
@@ -106,6 +113,7 @@ module.exports = async ({ github, context, core, exec }) => {
   }
 
   if (bustCache) {
+    core.exportVariable("SCCACHE_BUST_CACHE", "true");
     core.exportVariable("SCCACHE_RECACHE", "1");
     core.info("SCCACHE_RECACHE enabled because bust_cache is true");
   }

.github/workflows/autobuild.yml

@@ -51,7 +51,7 @@ jobs:
       image: ghcr.io/terrapkg/appstream-generator:main
     steps:
       - name: Download artifacts
-        uses: actions/download-artifact@v7
+        uses: actions/download-artifact@v8
         with:
           merge-multiple: true
           path: ./artifacts
@@ -69,6 +69,18 @@ jobs:
             --basename=test \
             --veto-ignore=missing-parents \
             --veto-ignore=missing-info 2>&1 | tee asb.log
+
+      - name: Run appstreamcli validate
+        run: |
+          echo "## AppStream MetaInfo Validation" >> $GITHUB_STEP_SUMMARY
+          echo "" >> $GITHUB_STEP_SUMMARY
+          echo '```xml' >> $GITHUB_STEP_SUMMARY
+          for file in output/test.xml.gz; do
+            appstreamcli validate $file >> $GITHUB_STEP_SUMMARY || true
+            echo "" >> $GITHUB_STEP_SUMMARY
+          done
+          echo '```' >> $GITHUB_STEP_SUMMARY
+          
       - name: Export logs
         id: export_logs
         run: |

.github/workflows/json-build.yml

@@ -55,6 +55,18 @@ jobs:
       - name: Set up git repository
         run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
 
+      - name: Configure sccache
+        id: sccache
+        if: ${{ !contains(matrix.pkg.labels.sccache, '0') }}
+        uses: actions/github-script@v8
+        env:
+          SCCACHE_GHA_VERSION: ${{ matrix.version }}-${{ matrix.pkg.arch }}-${{ matrix.pkg.pkg }}
+          SCCACHE_GHA_CACHE_FROM: ${{ matrix.version }}-${{ matrix.pkg.arch }}-${{ matrix.pkg.pkg }}
+        with:
+          script: |
+            const script = require('./.github/scripts/configure-sccache.js')
+            await script({github, context, core, exec})
+
       - name: CI Setup Script
         if: ${{ !contains(matrix.pkg.labels, 'mock') }}
         run: |
@@ -69,21 +81,17 @@ jobs:
           dir=$(dirname ${{ matrix.pkg.pkg }})
           dnf5 builddep -y ${dir}/*.spec
 
-      - name: Configure sccache
-        if: ${{ !contains(matrix.pkg.labels, 'sccache') }}
-        run: |
-          set -euo pipefail
-          echo "RUSTC_WRAPPER=/usr/bin/sccache" >> $GITHUB_ENV
-          echo "CARGO_INCREMENTAL=false" >> $GITHUB_ENV
-          echo "SCCACHE_GHA_ENABLED=true" >> $GITHUB_ENV
-          if [ "${{ inputs.bust_cache }}" = "true" ]; then
-            echo "SCCACHE_BUST_CACHE=true" >> $GITHUB_ENV
-          fi
-
-
       - name: Build with Andaman
         run: anda build -D "vendor Terra" -D "__python %{__python3}" ${{ matrix.pkg.pkg }} -c terra-${{ matrix.version }}-${{ matrix.pkg.arch }} ${{ !matrix.pkg.labels.mock == '1' && '-rrpmbuild' || '' }}
 
+      - name: Report Cache Summary
+        if: steps.sccache.outcome == 'success'
+        uses: actions/github-script@v8
+        with:
+          script: |
+            const script = require('./.github/scripts/sccache-stats.js')
+            await script({github, context, core, exec})
+
       - name: Generating artifact name
         id: art
         run: |
@@ -91,7 +99,7 @@ jobs:
           x=${NAME//\//@}
           echo "name=$x" >> $GITHUB_OUTPUT
 
-      - uses: actions/upload-artifact@v6
+      - uses: actions/upload-artifact@v7
         with:
           name: ${{ steps.art.outputs.name }}
           compression-level: 0 # The RPMs are already compressed :p

.github/workflows/update-nightly.yml

@@ -48,6 +48,7 @@ jobs:
               git add anda
               git commit -S -a -m "$msg"
             }
+            copy_over f44 || true
             copy_over f43 || true
             copy_over f42 || true
             copy_over el10 || true

.github/workflows/update-weekly.yml

@@ -48,6 +48,7 @@ jobs:
               git add anda
               git commit -S -a -m "$msg"
             }
+            copy_over f44 || true
             copy_over f43 || true
             copy_over f42 || true
             copy_over el10 || true

.github/workflows/update.yml

@@ -48,6 +48,7 @@ jobs:
               git add anda
               git commit -S -a -m "$msg"
             }
+            copy_over f44 || true
             copy_over f43 || true
             copy_over f42 || true
             copy_over el10 || true