fixups

Signed-off-by: Paul Spooren <mail@aparcar.org>

Author: aparcar

.github/workflows/daily.yml

@@ -12,7 +12,6 @@ env:
   PYTHONUNBUFFERED: "1"
   PYTEST_ADDOPTS: "--color=yes"
   LG_CONSOLE: "internal"
-  LG_FEATURE_APK: "true"
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
@@ -42,9 +41,9 @@ jobs:
           oldstable_branch=$(echo "$oldstable_version" | cut -d. -f1,2)
 
           versions="[
-            {\"type\": \"snapshot\", \"name\": \"snapshot\", \"url_base\": \"https://mirror-03.infra.openwrt.org/snapshots/targets\"},
-            {\"type\": \"stable\", \"name\": \"$stable_branch\", \"version\": \"$stable_version\", \"url_base\": \"https://mirror-03.infra.openwrt.org/releases/$stable_branch-SNAPSHOT/targets\"},
-            {\"type\": \"stable\", \"name\": \"$oldstable_branch\", \"version\": \"$oldstable_version\", \"url_base\": \"https://mirror-03.infra.openwrt.org/releases/$oldstable_branch-SNAPSHOT/targets\"}
+            {\"type\": \"snapshot\", \"name\": \"snapshot\", \"version_url\": \"https://mirror-03.infra.openwrt.org/snapshots/targets\"},
+            {\"type\": \"stable\", \"name\": \"$stable_branch\", \"version\": \"$stable_version\", \"version_url\": \"https://mirror-03.infra.openwrt.org/releases/$stable_branch-SNAPSHOT/targets\"},
+            {\"type\": \"stable\", \"name\": \"$oldstable_branch\", \"version\": \"$oldstable_version\", \"version_url\": \"https://mirror-03.infra.openwrt.org/releases/$oldstable_branch-SNAPSHOT/targets\"}
           ]"
 
           device_matrix=$(yq -o=json '
@@ -72,7 +71,7 @@ jobs:
 
           # Combine devices with versions to create full matrix
           matrix=$(echo "$device_matrix" | jq --argjson versions "$versions" '
-            [.[] as $device | $versions[] as $version | $device + {"version": $version, "version_name": $version.name}]
+            [.[] as $device | $versions[] as $version | $device + {"version_url": $version.version_url, "version_name": $version.name}]
           ')
           echo "matrix=$(echo "$matrix" | jq -c '.')" >> $GITHUB_ENV
 
@@ -83,9 +82,9 @@ jobs:
             {"target": "armsr-armv8", "firmware": "generic-initramfs-kernel.bin", "dependency": "qemu-system-aarch64"}
           ]'
           qemu_matrix=$(echo "$qemu_base" | jq --argjson versions "$versions" '
-            [.[] as $qemu | $versions[] as $version | $qemu + {"version": $version, "version_name": $version.name}]
+            [.[] as $qemu | $versions[] as $version | $qemu + {"version_url": $version.version_url, "version_name": $version.name}]
           ')
-          echo "qemu-matrix=$(echo "$qemu_matrix" | jq -c '.')" >> $GITHUB_ENV
+          echo "qemu_matrix=$(echo "$qemu_matrix" | jq -c '.')" >> $GITHUB_ENV
 
       - name: Filter out devices with open healthcheck issues
         id: set-matrix
@@ -104,9 +103,13 @@ jobs:
           ')
 
           deduplicated_matrix=$(echo "$filtered_matrix" | jq '
-            group_by(.device) | map(.[0])
+            group_by(.device,.version_name) | map(.[0])
           ')
 
+          echo "matrix=$matrix"
+          echo "deduplicated_matrix=$deduplicated_matrix"
+          echo "qemu_matrix=$qemu_matrix"
+
           echo "matrix=$(echo "$deduplicated_matrix" | jq -c '.')" >> $GITHUB_OUTPUT
           echo "qemu-matrix=$(echo "$qemu_matrix" | jq -c '.')" >> $GITHUB_OUTPUT
 
@@ -129,16 +132,15 @@ jobs:
       - name: Set environment
         env:
           target: ${{ matrix.target }}
-          version_type: ${{ matrix.version.type }}
-          version_name: ${{ matrix.version.name }}
-          url_base: ${{ matrix.version.url_base }}
+          VERSION_NAME: ${{ matrix.version_name }}
+          UPSTREAM_URL: ${{ matrix.version_url }}
         run: |
-          echo "VERSION_NAME=$version_name" >> $GITHUB_ENV
+          if [ "$VERSION_NAME" = "snapshot" ]; then
+            # Define labgrid features
+            echo "LG_FEATURE_APK=true" >> $GITHUB_ENV
 
-          if [ "$version_type" = "snapshot" ]; then
             # Snapshot logic (existing)
             export firmware=openwrt-${{ matrix.target }}-${{ matrix.device }}-${{ matrix.firmware }}
-            UPSTREAM_URL="$url_base"
 
             mkdir -p /tmp/tftp/${{ matrix.device }}
             wget $UPSTREAM_URL/${target/-/\/}/$firmware \
@@ -150,7 +152,6 @@ jobs:
             echo "LG_IMAGE=/tmp/tftp/${{ matrix.device }}/${firmware/.gz/}" >> $GITHUB_ENV
           else
             # Stable release logic
-            UPSTREAM_URL="$url_base"
 
             # Fetch profiles.json to get real firmware filename
             profiles_url="$UPSTREAM_URL/${target/-/\/}/profiles.json"
@@ -212,7 +213,7 @@ jobs:
               --output-document /tmp/tftp/${{ matrix.device }}/$firmware_filename
             (cd /tmp/tftp/ && gzip -df ${{ matrix.device }}/$firmware_filename) || true
 
-            FIRMWARE_VERSION=$(echo "$profiles_json" | jq -r '.version_number')
+            FIRMWARE_VERSION=$(echo "$profiles_json" | jq -r '.version_code')
             echo "FIRMWARE_VERSION=$FIRMWARE_VERSION" >> $GITHUB_ENV
             echo "LG_IMAGE=/tmp/tftp/${{ matrix.device }}/${firmware_filename/.gz/}" >> $GITHUB_ENV
           fi
@@ -229,10 +230,10 @@ jobs:
 
       - name: Run test
         run: |
-          mkdir -p ${{ matrix.device }}-${{ matrix.version.name }}/
+          mkdir -p ${{ matrix.device }}-${{ matrix.version_name }}/
           uv run pytest tests/ \
-            --lg-log ${{ matrix.device }}-${{ matrix.version.name }}/ \
-            --junitxml=${{ matrix.device }}-${{ matrix.version.name }}/report.xml \
+            --lg-log ${{ matrix.device }}-${{ matrix.version_name }}/ \
+            --junitxml=${{ matrix.device }}-${{ matrix.version_name }}/report.xml \
             --lg-colored-steps \
             --log-cli-level=CONSOLE
 
@@ -246,8 +247,8 @@ jobs:
         uses: actions/upload-artifact@v4
         if: always()
         with:
-          name: results-${{ matrix.device }}-${{ matrix.version.name }}
-          path: ${{ matrix.device }}-${{ matrix.version.name }}/*
+          name: results-${{ matrix.device }}-${{ matrix.version_name }}
+          path: ${{ matrix.device }}-${{ matrix.version_name }}/*
 
   test-qemu:
     name: ${{ matrix.target }} (${{ matrix.version_name }})
@@ -272,27 +273,29 @@ jobs:
             ${{ matrix.dependency }}
 
           echo "LG_ENV=targets/qemu-${{ matrix.target }}.yaml" >> $GITHUB_ENV
-          echo "VERSION_NAME=${{ matrix.version.name }}" >> $GITHUB_ENV
+          echo "VERSION_NAME=${{ matrix.version_name }}" >> $GITHUB_ENV
 
       - name: Install uv
         uses: astral-sh/setup-uv@v6
 
       - name: Download test firmware
         env:
           target: ${{ matrix.target }}
-          version_type: ${{ matrix.version.type }}
-          version_name: ${{ matrix.version.name }}
-          url_base: ${{ matrix.version.url_base }}
+          VERSION_NAME: ${{ matrix.version_name }}
+          UPSTREAM_URL: ${{ matrix.version_url }}
         run: |
-          if [ "$version_type" = "snapshot" ]; then
+          if [ "$VERSION_NAME" = "snapshot" ]; then
+            # Define labgrid features
+            echo "LG_FEATURE_APK=true" >> $GITHUB_ENV
+
             # Snapshot logic
             firmware_name="openwrt-$target-${{ matrix.firmware }}"
-            wget "$url_base/${target/-/\/}/$firmware_name" \
+            wget "$UPSTREAM_URL/${target/-/\/}/$firmware_name" \
               --output-document "$firmware_name"
-            FIRMWARE_VERSION=$(curl "$url_base/${target/-/\/}/version.buildinfo")
+            FIRMWARE_VERSION=$(curl "$UPSTREAM_URL/${target/-/\/}/version.buildinfo")
           else
             # Stable release logic
-            profiles_url="$url_base/${target/-/\/}/profiles.json"
+            profiles_url="$UPSTREAM_URL/${target/-/\/}/profiles.json"
             profiles_json=$(curl -s "$profiles_url")
 
             # Find the appropriate image for QEMU
@@ -336,9 +339,9 @@ jobs:
             fi
 
             echo "Using firmware: $firmware_name"
-            wget "$url_base/${target/-/\/}/$firmware_name" \
+            wget "$UPSTREAM_URL/${target/-/\/}/$firmware_name" \
               --output-document "$firmware_name"
-            FIRMWARE_VERSION=$(echo "$profiles_json" | jq -r '.version_number')
+            FIRMWARE_VERSION=$(echo "$profiles_json" | jq -r '.version_code')
           fi
 
           echo "FIRMWARE_VERSION=$FIRMWARE_VERSION" >> $GITHUB_ENV
@@ -349,11 +352,11 @@ jobs:
           gunzip $FIRMWARE_FILE || true
           firmware_file=${FIRMWARE_FILE/.gz/}
 
-          mkdir -p ${{ matrix.target }}-${{ matrix.version.name }}
+          mkdir -p ${{ matrix.target }}-${{ matrix.version_name }}
 
           uv run pytest tests/ \
-            --lg-log ${{ matrix.target }}-${{ matrix.version.name }}/ \
-            --junitxml=${{ matrix.target }}-${{ matrix.version.name }}/report.xml \
+            --lg-log ${{ matrix.target }}-${{ matrix.version_name }}/ \
+            --junitxml=${{ matrix.target }}-${{ matrix.version_name }}/report.xml \
             --lg-colored-steps \
             --log-cli-level=CONSOLE \
             --firmware $GITHUB_WORKSPACE/$firmware_file
@@ -362,8 +365,8 @@ jobs:
         uses: actions/upload-artifact@v4
         if: always()
         with:
-          name: results-qemu_${{ matrix.target }}-${{ matrix.version.name }}
-          path: ${{ matrix.target }}-${{ matrix.version.name }}/*
+          name: results-qemu_${{ matrix.target }}-${{ matrix.version_name }}
+          path: ${{ matrix.target }}-${{ matrix.version_name }}/*
 
   results:
     name: Deploy results page
@@ -456,7 +459,7 @@ jobs:
             "version_name": "snapshot",
             "version_title": "Development Snapshots",
             "description": "Latest development builds",
-            "url_base": "https://mirror-03.infra.openwrt.org/snapshots/targets",
+            "version_url": "https://mirror-03.infra.openwrt.org/snapshots/targets",
             "generated_at": "$(date -u +"%Y-%m-%dT%H:%M:%S.%3NZ")"
           }
           EOF
@@ -467,7 +470,7 @@ jobs:
             "version_name": "$stable_branch",
             "version_title": "Current Stable Release",
             "description": "Daily rebuilds of current stable release ($stable_branch)",
-            "url_base": "https://mirror-03.infra.openwrt.org/releases/$stable_branch-SNAPSHOT/targets",
+            "version_url": "https://mirror-03.infra.openwrt.org/releases/$stable_branch-SNAPSHOT/targets",
             "generated_at": "$(date -u +"%Y-%m-%dT%H:%M:%S.%3NZ")"
           }
           EOF
@@ -478,7 +481,7 @@ jobs:
             "version_name": "$oldstable_branch",
             "version_title": "Previous Stable Release",
             "description": "Daily rebuilds of previous stable release ($oldstable_branch)",
-            "url_base": "https://mirror-03.infra.openwrt.org/releases/$oldstable_branch-SNAPSHOT/targets",
+            "version_url": "https://mirror-03.infra.openwrt.org/releases/$oldstable_branch-SNAPSHOT/targets",
             "generated_at": "$(date -u +"%Y-%m-%dT%H:%M:%S.%3NZ")"
           }
           EOF

.github/workflows/pull_requests.yml

@@ -1,7 +1,9 @@
 name: Pull Requests
 
 on:
-  pull_request:
+  push:
+    branches:
+      - main
 
 env:
   PYTHONUNBUFFERED: "1"