20020502

Author: Roarcannotprogramming

.github/workflows/build_image.yml

@@ -69,18 +69,31 @@ jobs:
     - uses: actions/download-artifact@v3
       with:
         name: luci-theme-argon
-    - name: Run Make
+    - name: Prepare Passwall
       run: |
-        apt update
-        apt upgrade -y
-        apt install git -y
         export VOLUME_HOME=$(pwd)
         cd /home/build/openwrt
         mv $VOLUME_HOME/passwall.tar.gz packages
         pushd packages
         tar zxvf passwall.tar.gz
         rm passwall.tar.gz
         popd
+    - name: Prepare Argon
+      run: |
+        export VOLUME_HOME=$(pwd)
+        cd /home/build/openwrt
+        mv $VOLUME_HOME/luci-theme-argon.tar.gz packages
+        pushd packages
+        tar zxvf luci-theme-argon.tar.gz
+        rm luci-theme-argon.tar.gz
+        popd
+    - name: Debug Print
+      run: |
+        ls -alh /home/build/openwrt/packages
+    - name: Make Image
+      run: |
+        export VOLUME_HOME=$(pwd)
+        cd /home/build/openwrt
         chown -R build:build packages
         sudo -u build sed -i "s/CONFIG_TARGET_ROOTFS_PARTSIZE=[0-9]\+/CONFIG_TARGET_ROOTFS_PARTSIZE=1024/g;s/CONFIG_TARGET_KERNEL_PARTSIZE=[0-9]\+/CONFIG_TARGET_KERNEL_PARTSIZE=256/g" .config
         sudo -u build make image PROFILE=generic PACKAGES="luci luci-app-qos luci-app-upnp luci-proto-ipv6 kmod-igc luci-i18n-base-zh-cn netdata luci-app-passwall luci-theme-argon -dnsmasq"
@@ -90,6 +103,3 @@ jobs:
       with:
           name: openwrt
           path: openwrt-x86-64-master.tar.gz
-
-
-