update

.github/workflows/build-openwrt.yml

@@ -47,6 +47,7 @@ jobs:
   
     - name: Load Settings.ini
       run: |
+        source "${GITHUB_WORKSPACE}/devices/common/settings.ini"
         source "${GITHUB_WORKSPACE}/devices/${{matrix.target}}/settings.ini"
         echo "REPO_URL=${REPO_URL}" >> $GITHUB_ENV
         echo "REPO_BRANCH=${REPO_BRANCH}" >> $GITHUB_ENV
@@ -211,6 +212,18 @@ jobs:
         elif [ ${{matrix.target}} == "x86_64" ]; then
         echo "NOTICE=请分配不少于800M的存储容量" >> $GITHUB_ENV
         fi
+
+    - name: Deploy files to server
+      uses: easingthemes/ssh-deploy@master
+      continue-on-error: true
+      if: env.SSH_PRIVATE_KEY
+      with:
+        SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }}
+        ARGS: "-avzr --exclude=${{matrix.target}}.config"
+        SOURCE: firmware/
+        REMOTE_HOST: op.supes.top
+        REMOTE_USER: root
+        TARGET: "/www/wwwroot/op.supes.top/firmware/${{matrix.target}}/"
  
     - name: Upload firmware to cowtransfer
       if: env.UPLOAD_FIRMWARE_TO_COWTRANSFER == 'true'
@@ -232,18 +245,6 @@ jobs:
         echo "WETRANS=$wetrans" >> $GITHUB_ENV
         echo "Download Link: ${{ env.EMOJI }} $wetrans ${{ env.EMOJI }} 🚀"
 
-    - name: Deploy files to server
-      uses: easingthemes/ssh-deploy@master
-      continue-on-error: true
-      if: env.SSH_PRIVATE_KEY
-      with:
-        SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }}
-        ARGS: "-avzr --exclude=${{matrix.target}}.config"
-        SOURCE: firmware/
-        REMOTE_HOST: op.supes.top
-        REMOTE_USER: root
-        TARGET: "/www/wwwroot/op.supes.top/firmware/${{matrix.target}}/"
-
     - name: Create release
       id: create_release
       continue-on-error: true

.github/workflows/dispatcher-actions.yml

@@ -37,6 +37,7 @@ jobs:
   
     - name: Load Settings.ini
       run: |
+        source "${GITHUB_WORKSPACE}/devices/common/settings.ini"
         source "${GITHUB_WORKSPACE}/devices/${{matrix.target}}/settings.ini"
         echo "REPO_URL=${REPO_URL}" >> $GITHUB_ENV
         echo "REPO_BRANCH=${REPO_BRANCH}" >> $GITHUB_ENV
@@ -201,17 +202,7 @@ jobs:
         elif [ ${{matrix.target}} == "x86_64" ]; then
         echo "NOTICE=请分配不少于800M的存储容量" >> $GITHUB_ENV
         fi
- 
-    - name: Upload firmware to cowtransfer
-      if: env.UPLOAD_FIRMWARE_TO_COWTRANSFER == 'true'
-      continue-on-error: true
-      run: |
-        curl -fsSL git.io/file-transfer | sh
-        cowurl=$(./transfer cow --block 2621440 -s --no-progress ${FIRMWARE})
-        cowurl=$(echo $cowurl | grep -o -E "https[^ ]*")
-        echo "COWURL=$cowurl" >> $GITHUB_ENV
-        echo "Download Link: ${{ env.EMOJI }} $cowurl ${{ env.EMOJI }} 🚀"
-        
+
     - name: Deploy files to server
       uses: easingthemes/ssh-deploy@master
       continue-on-error: true
@@ -224,6 +215,16 @@ jobs:
         REMOTE_USER: root
         TARGET: "/www/wwwroot/op.supes.top/firmware/${{matrix.target}}/"
  
+    - name: Upload firmware to cowtransfer
+      if: env.UPLOAD_FIRMWARE_TO_COWTRANSFER == 'true'
+      continue-on-error: true
+      run: |
+        curl -fsSL git.io/file-transfer | sh
+        cowurl=$(./transfer cow --block 2621440 -s --no-progress ${FIRMWARE})
+        cowurl=$(echo $cowurl | grep -o -E "https[^ ]*")
+        echo "COWURL=$cowurl" >> $GITHUB_ENV
+        echo "Download Link: ${{ env.EMOJI }} $cowurl ${{ env.EMOJI }} 🚀"
+ 
     - name: Upload firmware to WeTransfer
       if: env.UPLOAD_FIRMWARE_TO_WETRANSFER == 'true' && ! contains(github.event.action, 'noup')
       continue-on-error: true

README.md

@@ -42,7 +42,19 @@
 
 + SSL兼容,可同时使用http IP访问和绑定域名开启https访问
 
-固件下载 [x86_64,phicomm-k2p,redmi-ac2100,nanopi-r2s,newifi-d2,hiwifi-HC5962,phicomm-N1](https://op.supes.top/firmware/),每周日更新固件.
+| 设备           | 下载                                                | 说明                                 |
+|----------------|-----------------------------------------------------|--------------------------------------|
+| X86_64         | [📥](https://op.supes.top/firmware/x86_64/)         | 请分配不少于800M的存储空间           |
+| Redmi-ac2100   | [📥](https://op.supes.top/firmware/redmi-ac2100/)   | 在breed中需要先刷底包                |
+| Phicomm-k2p    | [📥](https://op.supes.top/firmware/phicomm-k2p/)    | 闪存布局请选择斐讯而非默认的公版     |
+| K2p-32m-usb    | [📥](https://op.supes.top/firmware/k2p-32m-usb/)    | 闪存布局请选择斐讯而非默认的公版     |
+| NanoPi-r2s     | [📥](https://op.supes.top/firmware/nanopi-r2s/)     | 默认交换了网口,靠近电源口的是WAN口   |
+| Phicomm-N1     | [📥](https://op.supes.top/firmware/phicomm-N1/)     | 另需使用打包工具生成刷机固件         |
+| Newifi-d2      | [📥](https://op.supes.top/firmware/newifi-d2/)      |                                      |
+| Hiwifi-hc5962  | [📥](https://op.supes.top/firmware/hiwifi-hc5962/)  |                                      |
+| Xiaomi-r3p     | [📥](https://op.supes.top/firmware/xiaomi-r3p/)     |                                      |
+| XY-C5          | [📥](https://op.supes.top/firmware/XY-C5/)          |                                      |
+
 
 后台入口 10.0.0.1  (若后台无法打开,请插拔交换wan,lan网线顺序.)
 

devices/XY-C5/settings.ini → devices/common/settings.ini

@@ -6,6 +6,6 @@ FREE_UP_DISK="true"
 SSH_ACTIONS="false"
 UPLOAD_BIN_DIR_FOR_ARTIFACT="false"
 UPLOAD_FIRMWARE_FOR_ARTIFACT="true"
-UPLOAD_FIRMWARE_FOR_RELEASE="true"
+UPLOAD_FIRMWARE_FOR_RELEASE="false"
 UPLOAD_FIRMWARE_TO_COWTRANSFER="false"
 UPLOAD_FIRMWARE_TO_WETRANSFER="true"

devices/hiwifi-hc5962/settings.ini

@@ -1,11 +0,0 @@
-REPO_URL="https://github.com/openwrt/openwrt"
-REPO_BRANCH="master"
-CONFIG_FILE=".config"
-DIY_SH="diy.sh"
-FREE_UP_DISK="true"
-SSH_ACTIONS="false"
-UPLOAD_BIN_DIR_FOR_ARTIFACT="false"
-UPLOAD_FIRMWARE_FOR_ARTIFACT="true"
-UPLOAD_FIRMWARE_FOR_RELEASE="true"
-UPLOAD_FIRMWARE_TO_COWTRANSFER="false"
-UPLOAD_FIRMWARE_TO_WETRANSFER="true"

devices/k2p-32m-usb/settings.ini

@@ -1,11 +0,0 @@
-REPO_URL="https://github.com/openwrt/openwrt"
-REPO_BRANCH="master"
-CONFIG_FILE=".config"
-DIY_SH="diy.sh"
-FREE_UP_DISK="true"
-SSH_ACTIONS="false"
-UPLOAD_BIN_DIR_FOR_ARTIFACT="false"
-UPLOAD_FIRMWARE_FOR_ARTIFACT="true"
-UPLOAD_FIRMWARE_FOR_RELEASE="true"
-UPLOAD_FIRMWARE_TO_COWTRANSFER="false"
-UPLOAD_FIRMWARE_TO_WETRANSFER="true"

devices/nanopi-r2s/settings.ini

@@ -1,11 +0,0 @@
-REPO_URL="https://github.com/openwrt/openwrt"
-REPO_BRANCH="master"
-CONFIG_FILE=".config"
-DIY_SH="diy.sh"
-FREE_UP_DISK="true"
-SSH_ACTIONS="false"
-UPLOAD_BIN_DIR_FOR_ARTIFACT="false"
-UPLOAD_FIRMWARE_FOR_ARTIFACT="true"
-UPLOAD_FIRMWARE_FOR_RELEASE="true"
-UPLOAD_FIRMWARE_TO_COWTRANSFER="false"
-UPLOAD_FIRMWARE_TO_WETRANSFER="true"

devices/newifi-d2/settings.ini

@@ -1,11 +0,0 @@
-REPO_URL="https://github.com/openwrt/openwrt"
-REPO_BRANCH="master"
-CONFIG_FILE=".config"
-DIY_SH="diy.sh"
-FREE_UP_DISK="true"
-SSH_ACTIONS="false"
-UPLOAD_BIN_DIR_FOR_ARTIFACT="false"
-UPLOAD_FIRMWARE_FOR_ARTIFACT="true"
-UPLOAD_FIRMWARE_FOR_RELEASE="true"
-UPLOAD_FIRMWARE_TO_COWTRANSFER="false"
-UPLOAD_FIRMWARE_TO_WETRANSFER="true"

devices/phicomm-N1/settings.ini

@@ -1,11 +0,0 @@
-REPO_URL="https://github.com/openwrt/openwrt"
-REPO_BRANCH="master"
-CONFIG_FILE=".config"
-DIY_SH="diy.sh"
-FREE_UP_DISK="true"
-SSH_ACTIONS="false"
-UPLOAD_BIN_DIR_FOR_ARTIFACT="false"
-UPLOAD_FIRMWARE_FOR_ARTIFACT="true"
-UPLOAD_FIRMWARE_FOR_RELEASE="true"
-UPLOAD_FIRMWARE_TO_COWTRANSFER="false"
-UPLOAD_FIRMWARE_TO_WETRANSFER="true"

devices/phicomm-k2p/settings.ini

@@ -1,11 +0,0 @@
-REPO_URL="https://github.com/openwrt/openwrt"
-REPO_BRANCH="master"
-CONFIG_FILE=".config"
-DIY_SH="diy.sh"
-FREE_UP_DISK="true"
-SSH_ACTIONS="false"
-UPLOAD_BIN_DIR_FOR_ARTIFACT="false"
-UPLOAD_FIRMWARE_FOR_ARTIFACT="true"
-UPLOAD_FIRMWARE_FOR_RELEASE="true"
-UPLOAD_FIRMWARE_TO_COWTRANSFER="false"
-UPLOAD_FIRMWARE_TO_WETRANSFER="true"

devices/redmi-ac2100/settings.ini

@@ -1,11 +0,0 @@
-REPO_URL="https://github.com/openwrt/openwrt"
-REPO_BRANCH="master"
-CONFIG_FILE=".config"
-DIY_SH="diy.sh"
-FREE_UP_DISK="true"
-SSH_ACTIONS="false"
-UPLOAD_BIN_DIR_FOR_ARTIFACT="false"
-UPLOAD_FIRMWARE_FOR_ARTIFACT="true"
-UPLOAD_FIRMWARE_FOR_RELEASE="true"
-UPLOAD_FIRMWARE_TO_COWTRANSFER="false"
-UPLOAD_FIRMWARE_TO_WETRANSFER="true"

devices/x86_64/settings.ini

@@ -1,11 +0,0 @@
-REPO_URL="https://github.com/openwrt/openwrt"
-REPO_BRANCH="master"
-CONFIG_FILE=".config"
-DIY_SH="diy.sh"
-FREE_UP_DISK="true"
-SSH_ACTIONS="false"
-UPLOAD_BIN_DIR_FOR_ARTIFACT="false"
-UPLOAD_FIRMWARE_FOR_ARTIFACT="true"
-UPLOAD_FIRMWARE_FOR_RELEASE="true"
-UPLOAD_FIRMWARE_TO_COWTRANSFER="false"
-UPLOAD_FIRMWARE_TO_WETRANSFER="true"