From: Daniel Nilsson <dannil+github@protonmail.com>
Date: Fri, 15 Nov 2024 21:38:41 +0000 (+0100)
Subject: ci: account for APK as default on main branch
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=22518fa15f68ffa99af1af5d92f952eac780fb11;p=project%2Fluci.git

ci: account for APK as default on main branch

With APK defaulted on openwrt:main, we should include packages with the
.apk file extension as artifacts. Also default the logging to V=s as
otherwise the APK version check won't be printed to stdout.

Signed-off-by: Daniel Nilsson <dannil+github@protonmail.com>
---

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 982a3447b4..68ca564bae 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -54,15 +54,18 @@ jobs:
         env:
           ARCH: ${{ matrix.arch }}-${{ env.BRANCH }}
           FEEDNAME: packages_ci
+          V: s
 
       - name: Move created packages to project dir
-        run: cp bin/packages/${{ matrix.arch }}/packages_ci/*.ipk . || true
+        run: cp bin/packages/${{ matrix.arch }}/packages_ci/* . || true
 
       - name: Store packages
         uses: actions/upload-artifact@v4
         with:
           name: ${{ matrix.arch}}-packages
-          path: "*.ipk"
+          path: |
+            *.ipk
+            *.apk
 
       - name: Store logs
         uses: actions/upload-artifact@v4