fix something

RROrg · Jan 20, 2024 · 171e0dc · 171e0dc
1 parent 0b5766b
commit 171e0dc
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 2 deletions.
diff --git a/.github/workflows/modules.yml b/.github/workflows/modules.yml
@@ -29,7 +29,6 @@ jobs:
           - arch: x86_64
             kver: 5.10.60
 
-
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
@@ -53,6 +52,7 @@ jobs:
 
       - name: Make modules
         run: |
+          sudo -s  # use root to compile
           export WORK_PATH=${{ github.workspace }}
           . qr-modules/compile.sh
           echo "----------------- Env  -----------------"
@@ -79,7 +79,7 @@ jobs:
 
       - name: Tar to Artifacts
         run: |
-          tar caf ${{ matrix.arch }}-${{ matrix.kver }}.tgz -C output .
+          tar -caf ${{ matrix.arch }}-${{ matrix.kver }}.tgz -C output .
 
 
       - name: Upload to Artifacts

diff --git a/.github/workflows/qr.yml b/.github/workflows/qr.yml
@@ -95,6 +95,8 @@ jobs:
           cd qr
           . scripts/func.sh "${{ secrets.RRORG }}"
           convertpo2mo "files/initrd/opt/qr/lang"
+          getAddons "files/p8/addons" ${{ inputs.prerelease }}
+          getModules "files/p8/modules" ${{ inputs.prerelease }}
           echo "OK"
 
       # Build incremental
@@ -171,6 +173,26 @@ jobs:
           done < <(yq '.replace | explode(.) | to_entries | map([.key])[] | .[]' update-list.yml)
           zip -9j update.zip sha256sum
 
+          # updateall.zip
+          rm -f sha256sum
+          echo '  "files/p8/addons/": "/mnt/p8/addons/"' >> update-list.yml
+          echo '  "files/p8/modules/": "/mnt/p8/modules/"' >> update-list.yml
+
+          zip -9j updateall.zip update-list.yml update-check.sh
+          while read F; do
+            if [ -d "${F}" ]; then
+              FTGZ="$(basename "${F}").tgz"
+              tar -czf "${FTGZ}" -C "${F}" .
+              sha256sum "${FTGZ}" >> sha256sum
+              zip -9j updateall.zip "${FTGZ}"
+              rm -f "${FTGZ}"
+            else
+              (cd $(dirname "${F}") && sha256sum $(basename "${F}")) >> sha256sum
+              zip -9j updateall.zip "${F}"
+            fi
+          done < <(yq '.replace | explode(.) | to_entries | map([.key])[] | .[]' update-list.yml)
+          zip -9j updateall.zip sha256sum
+
       # Upload artifact
       - name: Upload
         if: env.VERSION == ''