content update

upsups · Nov 7, 2024 · 8d812f5 · 8d812f5
1 parent ac1f922
commit 8d812f5
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 22 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -34,19 +34,19 @@ jobs:
     strategy:
       matrix:
         VERSION: [23.05]
-        SET: [docker, non-docker]
+        SET: [native, docker]
 
     steps:
     - name: Checkout
-      uses: actions/checkout@main
+      uses: actions/checkout@v4
 
     - name: Initialization environment
       env:
         DEBIAN_FRONTEND: noninteractive
       run: |
         sudo rm -rf /etc/apt/sources.list.d
         sudo apt update
-        sudo apt install -y curl
+        sudo apt install -y ca-certificates curl git lsb-release
         curl -fsSL https://github.com/friendlyarm/build-env-on-ubuntu-bionic/raw/refs/heads/master/install.sh -o install.sh
         sed -i -e 's/^apt-get -y install openjdk-8-jdk/# apt-get -y install openjdk-8-jdk/g' install.sh
         sed -i -e 's/^\[ -d fa-toolchain \]/# [ -d fa-toolchain ]/g' install.sh
@@ -145,19 +145,19 @@ jobs:
       matrix:
         VERSION: [23.05]
         CPU: [rk3399, rk3566, rk3588]
-        SET: [docker, non-docker]
+        SET: [native, docker]
 
     steps:
     - name: Checkout
-      uses: actions/checkout@main
+      uses: actions/checkout@v4
 
     - name: Initialization environment
       env:
         DEBIAN_FRONTEND: noninteractive
       run: |
         sudo rm -rf /etc/apt/sources.list.d
         sudo apt update
-        sudo apt install -y curl
+        sudo apt install -y ca-certificates curl git lsb-release
         curl -fsSL https://github.com/friendlyarm/build-env-on-ubuntu-bionic/raw/refs/heads/master/install.sh -o install.sh
         sed -i -e 's/^apt-get -y install openjdk-8-jdk/# apt-get -y install openjdk-8-jdk/g' install.sh
         sed -i -e 's/^\[ -d fa-toolchain \]/# [ -d fa-toolchain ]/g' install.sh
@@ -191,19 +191,19 @@ jobs:
         repo sync -c scripts/sd-fuse  --no-clone-bundle
         repo sync -c toolchain  --no-clone-bundle
 
-    - name: Download friendlywrt rootfs (non-docker)
-      if: matrix.SET == 'non-docker'
-      uses: robinraju/release-downloader@v1.6
+    - name: Download friendlywrt rootfs (native)
+      if: matrix.SET == 'native'
+      uses: robinraju/release-downloader@v1
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         repository: ${{ github.repository }}
         tag: ${{ needs.prepare_release.outputs.release_tag }}
-        fileName: "rootfs-friendlywrt-${{ matrix.VERSION }}.tgz"
+        fileName: "rootfs-friendlywrt-${{ matrix.VERSION }}-native.tgz"
 
     - name: Download friendlywrt rootfs (docker)
       if: matrix.SET == 'docker'
-      uses: robinraju/release-downloader@v1.6
+      uses: robinraju/release-downloader@v1
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
@@ -216,23 +216,14 @@ jobs:
       run: |
         cd project
         case ${{ matrix.CPU }} in
-        rk3328)
-          MODEL=R2S-R2C-Series
-          ;;
-        rk3528)
-          MODEL=NanoPi-Zero2
-          ;;
         rk3399)
           MODEL=R4S-Series
           ;;
-        rk3568)
-          MODEL=R5S-R5C-Series
-          ;;
         rk3566)
           MODEL=R3S-Series
           ;;
         rk3588)
-          MODEL=T6-R6S-R6C-M6-Series
+          MODEL=R6C-R6S-Series
           ;;
         *)
           echo "unknow cpu"

diff --git a/scripts/add_packages.sh b/scripts/add_packages.sh
@@ -20,7 +20,7 @@ EOL
 # {{ Add luci-theme-argon
 (cd friendlywrt/package && {
 	[ -d luci-theme-argon ] && rm -rf luci-theme-argon
-	git clone https://github.com/jerrykuku/luci-theme-argon.git --depth 1 -b master
+	git clone --depth=1 https://github.com/jerrykuku/luci-theme-argon -b master
 })
 echo "CONFIG_PACKAGE_luci-theme-argon=y" >> configs/rockchip/01-nanopi
 sed -i -e 's/function init_theme/function old_init_theme/g' friendlywrt/target/linux/rockchip/armv8/base-files/root/setup.sh