diff --git a/.github/workflows/bcm27xx-bcm2708.yml b/.github/workflows/bcm27xx-bcm2708.yml index 718aea361..62cce5590 100644 --- a/.github/workflows/bcm27xx-bcm2708.yml +++ b/.github/workflows/bcm27xx-bcm2708.yml @@ -20,11 +20,11 @@ env: SOURCE_URL: https://github.com/immortalwrt/immortalwrt SOURCE_BRANCH: openwrt-18.06-k5.4 DIY_SH: scripts/custom.sh - WEBROOT: /data/dnmp/www/openwrt.cc TOOLCHAIN_TAG: toolchain CLASH_BINARY_PLATFORM: armv6 TOOLCHAIN_RELEASE_UPLOAD: true FIRMWARE_RELEASE_UPLOAD: true + WEB_ROOT_PATH: /data/dnmp/www/openwrt.cc TZ: Asia/Shanghai jobs: @@ -376,13 +376,17 @@ jobs: cd $OPENWRT_ROOT_PATH unzip $DEVICE_TARGET-$DEVICE_SUBTARGET.zip + - name: Organize Files + run: | + cd $OPENWRT_ROOT_PATH/bin/targets/$DEVICE_TARGET/$DEVICE_SUBTARGET + rm -rf packages + df -hT $PWD + - name: Deploy Files To HostHatch Node env: HOST: "${{ secrets.REMOTE_USER }}@${{ secrets.HOSTHATCH_IP }}" SOURCE_TARGETS: "${{ env.OPENWRT_ROOT_PATH }}/bin/targets/${{ env.DEVICE_TARGET }}/${{ env.DEVICE_SUBTARGET }}/" - SOURCE_PACKAGES: "${{ env.OPENWRT_ROOT_PATH }}/bin/packages/${{ env.DEVICE_PLATFORM }}/" DEST_TARGETS: "${{ env.WEB_ROOT_PATH }}/snapshots/targets/${{ env.DEVICE_TARGET }}/${{ env.DEVICE_SUBTARGET }}/" - DEST_PACKAGES: "${{ env.WEB_ROOT_PATH }}/snapshots/packages/${{ env.DEVICE_PLATFORM }}/" REMOTE_PRIVATEKEY: "${{ secrets.HOSTHATCH_PRIVATEKEY }}" if: env.REMOTE_PRIVATEKEY != null run: | @@ -394,15 +398,12 @@ jobs: bash -c "'mkdir -p $WEB_ROOT_PATH/snapshots/targets/$DEVICE_TARGET/$DEVICE_SUBTARGET \ $WEB_ROOT_PATH/snapshots/packages/$DEVICE_PLATFORM'" rsync -chavP --delete -e 'ssh -i ~/.ssh/id_rsa -o StrictHostKeyChecking=no' $SOURCE_TARGETS $HOST:$DEST_TARGETS - rsync -chavP --delete -e 'ssh -i ~/.ssh/id_rsa -o StrictHostKeyChecking=no' $SOURCE_PACKAGES $HOST:$DEST_PACKAGES - name: Deploy Files To PacificRack Node env: HOST: "${{ secrets.REMOTE_USER }}@${{ secrets.PACIFICRACK_IP }}" SOURCE_TARGETS: "${{ env.OPENWRT_ROOT_PATH }}/bin/targets/${{ env.DEVICE_TARGET }}/${{ env.DEVICE_SUBTARGET }}/" - SOURCE_PACKAGES: "${{ env.OPENWRT_ROOT_PATH }}/bin/packages/${{ env.DEVICE_PLATFORM }}/" DEST_TARGETS: "${{ env.WEB_ROOT_PATH }}/snapshots/targets/${{ env.DEVICE_TARGET }}/${{ env.DEVICE_SUBTARGET }}/" - DEST_PACKAGES: "${{ env.WEB_ROOT_PATH }}/snapshots/packages/${{ env.DEVICE_PLATFORM }}/" REMOTE_PRIVATEKEY: "${{ secrets.PACIFICRACK_PRIVATEKEY }}" if: env.REMOTE_PRIVATEKEY != null run: | @@ -414,13 +415,6 @@ jobs: bash -c "'mkdir -p $WEB_ROOT_PATH/snapshots/targets/$DEVICE_TARGET/$DEVICE_SUBTARGET \ $WEB_ROOT_PATH/snapshots/packages/$DEVICE_PLATFORM'" rsync -chavP --delete -e 'ssh -i ~/.ssh/id_rsa -o StrictHostKeyChecking=no' $SOURCE_TARGETS $HOST:$DEST_TARGETS - rsync -chavP --delete -e 'ssh -i ~/.ssh/id_rsa -o StrictHostKeyChecking=no' $SOURCE_PACKAGES $HOST:$DEST_PACKAGES - - - name: Organize Files - run: | - cd $OPENWRT_ROOT_PATH/bin/targets/$DEVICE_TARGET/$DEVICE_SUBTARGET - rm -rf packages - df -hT $PWD - name: Deploy Files To Release uses: ncipollo/release-action@v1.8.0 diff --git a/.github/workflows/bcm27xx-bcm2709.yml b/.github/workflows/bcm27xx-bcm2709.yml index 44b296f3d..59ddb7117 100644 --- a/.github/workflows/bcm27xx-bcm2709.yml +++ b/.github/workflows/bcm27xx-bcm2709.yml @@ -20,11 +20,11 @@ env: SOURCE_URL: https://github.com/immortalwrt/immortalwrt SOURCE_BRANCH: openwrt-18.06-k5.4 DIY_SH: scripts/custom.sh - WEBROOT: /data/dnmp/www/openwrt.cc TOOLCHAIN_TAG: toolchain CLASH_BINARY_PLATFORM: armv7 TOOLCHAIN_RELEASE_UPLOAD: true FIRMWARE_RELEASE_UPLOAD: true + WEB_ROOT_PATH: /data/dnmp/www/openwrt.cc TZ: Asia/Shanghai jobs: @@ -376,13 +376,17 @@ jobs: cd $OPENWRT_ROOT_PATH unzip $DEVICE_TARGET-$DEVICE_SUBTARGET.zip + - name: Organize Files + run: | + cd $OPENWRT_ROOT_PATH/bin/targets/$DEVICE_TARGET/$DEVICE_SUBTARGET + rm -rf packages + df -hT $PWD + - name: Deploy Files To HostHatch Node env: HOST: "${{ secrets.REMOTE_USER }}@${{ secrets.HOSTHATCH_IP }}" SOURCE_TARGETS: "${{ env.OPENWRT_ROOT_PATH }}/bin/targets/${{ env.DEVICE_TARGET }}/${{ env.DEVICE_SUBTARGET }}/" - SOURCE_PACKAGES: "${{ env.OPENWRT_ROOT_PATH }}/bin/packages/${{ env.DEVICE_PLATFORM }}/" DEST_TARGETS: "${{ env.WEB_ROOT_PATH }}/snapshots/targets/${{ env.DEVICE_TARGET }}/${{ env.DEVICE_SUBTARGET }}/" - DEST_PACKAGES: "${{ env.WEB_ROOT_PATH }}/snapshots/packages/${{ env.DEVICE_PLATFORM }}/" REMOTE_PRIVATEKEY: "${{ secrets.HOSTHATCH_PRIVATEKEY }}" if: env.REMOTE_PRIVATEKEY != null run: | @@ -394,15 +398,12 @@ jobs: bash -c "'mkdir -p $WEB_ROOT_PATH/snapshots/targets/$DEVICE_TARGET/$DEVICE_SUBTARGET \ $WEB_ROOT_PATH/snapshots/packages/$DEVICE_PLATFORM'" rsync -chavP --delete -e 'ssh -i ~/.ssh/id_rsa -o StrictHostKeyChecking=no' $SOURCE_TARGETS $HOST:$DEST_TARGETS - rsync -chavP --delete -e 'ssh -i ~/.ssh/id_rsa -o StrictHostKeyChecking=no' $SOURCE_PACKAGES $HOST:$DEST_PACKAGES - name: Deploy Files To PacificRack Node env: HOST: "${{ secrets.REMOTE_USER }}@${{ secrets.PACIFICRACK_IP }}" SOURCE_TARGETS: "${{ env.OPENWRT_ROOT_PATH }}/bin/targets/${{ env.DEVICE_TARGET }}/${{ env.DEVICE_SUBTARGET }}/" - SOURCE_PACKAGES: "${{ env.OPENWRT_ROOT_PATH }}/bin/packages/${{ env.DEVICE_PLATFORM }}/" DEST_TARGETS: "${{ env.WEB_ROOT_PATH }}/snapshots/targets/${{ env.DEVICE_TARGET }}/${{ env.DEVICE_SUBTARGET }}/" - DEST_PACKAGES: "${{ env.WEB_ROOT_PATH }}/snapshots/packages/${{ env.DEVICE_PLATFORM }}/" REMOTE_PRIVATEKEY: "${{ secrets.PACIFICRACK_PRIVATEKEY }}" if: env.REMOTE_PRIVATEKEY != null run: | @@ -414,13 +415,6 @@ jobs: bash -c "'mkdir -p $WEB_ROOT_PATH/snapshots/targets/$DEVICE_TARGET/$DEVICE_SUBTARGET \ $WEB_ROOT_PATH/snapshots/packages/$DEVICE_PLATFORM'" rsync -chavP --delete -e 'ssh -i ~/.ssh/id_rsa -o StrictHostKeyChecking=no' $SOURCE_TARGETS $HOST:$DEST_TARGETS - rsync -chavP --delete -e 'ssh -i ~/.ssh/id_rsa -o StrictHostKeyChecking=no' $SOURCE_PACKAGES $HOST:$DEST_PACKAGES - - - name: Organize Files - run: | - cd $OPENWRT_ROOT_PATH/bin/targets/$DEVICE_TARGET/$DEVICE_SUBTARGET - rm -rf packages - df -hT $PWD - name: Deploy Files To Release uses: ncipollo/release-action@v1.8.0 diff --git a/.github/workflows/bcm27xx-bcm2710.yml b/.github/workflows/bcm27xx-bcm2710.yml index eedca52bf..975f2d0ed 100644 --- a/.github/workflows/bcm27xx-bcm2710.yml +++ b/.github/workflows/bcm27xx-bcm2710.yml @@ -20,11 +20,11 @@ env: SOURCE_URL: https://github.com/immortalwrt/immortalwrt SOURCE_BRANCH: openwrt-18.06-k5.4 DIY_SH: scripts/custom.sh - WEBROOT: /data/dnmp/www/openwrt.cc TOOLCHAIN_TAG: toolchain CLASH_BINARY_PLATFORM: armv8 TOOLCHAIN_RELEASE_UPLOAD: true FIRMWARE_RELEASE_UPLOAD: true + WEB_ROOT_PATH: /data/dnmp/www/openwrt.cc TZ: Asia/Shanghai jobs: @@ -376,13 +376,17 @@ jobs: cd $OPENWRT_ROOT_PATH unzip $DEVICE_TARGET-$DEVICE_SUBTARGET.zip + - name: Organize Files + run: | + cd $OPENWRT_ROOT_PATH/bin/targets/$DEVICE_TARGET/$DEVICE_SUBTARGET + rm -rf packages + df -hT $PWD + - name: Deploy Files To HostHatch Node env: HOST: "${{ secrets.REMOTE_USER }}@${{ secrets.HOSTHATCH_IP }}" SOURCE_TARGETS: "${{ env.OPENWRT_ROOT_PATH }}/bin/targets/${{ env.DEVICE_TARGET }}/${{ env.DEVICE_SUBTARGET }}/" - SOURCE_PACKAGES: "${{ env.OPENWRT_ROOT_PATH }}/bin/packages/${{ env.DEVICE_PLATFORM }}/" DEST_TARGETS: "${{ env.WEB_ROOT_PATH }}/snapshots/targets/${{ env.DEVICE_TARGET }}/${{ env.DEVICE_SUBTARGET }}/" - DEST_PACKAGES: "${{ env.WEB_ROOT_PATH }}/snapshots/packages/${{ env.DEVICE_PLATFORM }}/" REMOTE_PRIVATEKEY: "${{ secrets.HOSTHATCH_PRIVATEKEY }}" if: env.REMOTE_PRIVATEKEY != null run: | @@ -394,15 +398,12 @@ jobs: bash -c "'mkdir -p $WEB_ROOT_PATH/snapshots/targets/$DEVICE_TARGET/$DEVICE_SUBTARGET \ $WEB_ROOT_PATH/snapshots/packages/$DEVICE_PLATFORM'" rsync -chavP --delete -e 'ssh -i ~/.ssh/id_rsa -o StrictHostKeyChecking=no' $SOURCE_TARGETS $HOST:$DEST_TARGETS - rsync -chavP --delete -e 'ssh -i ~/.ssh/id_rsa -o StrictHostKeyChecking=no' $SOURCE_PACKAGES $HOST:$DEST_PACKAGES - name: Deploy Files To PacificRack Node env: HOST: "${{ secrets.REMOTE_USER }}@${{ secrets.PACIFICRACK_IP }}" SOURCE_TARGETS: "${{ env.OPENWRT_ROOT_PATH }}/bin/targets/${{ env.DEVICE_TARGET }}/${{ env.DEVICE_SUBTARGET }}/" - SOURCE_PACKAGES: "${{ env.OPENWRT_ROOT_PATH }}/bin/packages/${{ env.DEVICE_PLATFORM }}/" DEST_TARGETS: "${{ env.WEB_ROOT_PATH }}/snapshots/targets/${{ env.DEVICE_TARGET }}/${{ env.DEVICE_SUBTARGET }}/" - DEST_PACKAGES: "${{ env.WEB_ROOT_PATH }}/snapshots/packages/${{ env.DEVICE_PLATFORM }}/" REMOTE_PRIVATEKEY: "${{ secrets.PACIFICRACK_PRIVATEKEY }}" if: env.REMOTE_PRIVATEKEY != null run: | @@ -414,13 +415,6 @@ jobs: bash -c "'mkdir -p $WEB_ROOT_PATH/snapshots/targets/$DEVICE_TARGET/$DEVICE_SUBTARGET \ $WEB_ROOT_PATH/snapshots/packages/$DEVICE_PLATFORM'" rsync -chavP --delete -e 'ssh -i ~/.ssh/id_rsa -o StrictHostKeyChecking=no' $SOURCE_TARGETS $HOST:$DEST_TARGETS - rsync -chavP --delete -e 'ssh -i ~/.ssh/id_rsa -o StrictHostKeyChecking=no' $SOURCE_PACKAGES $HOST:$DEST_PACKAGES - - - name: Organize Files - run: | - cd $OPENWRT_ROOT_PATH/bin/targets/$DEVICE_TARGET/$DEVICE_SUBTARGET - rm -rf packages - df -hT $PWD - name: Deploy Files To Release uses: ncipollo/release-action@v1.8.0 diff --git a/.github/workflows/bcm27xx-bcm2711.yml b/.github/workflows/bcm27xx-bcm2711.yml index 7b22c4d92..022c0af87 100644 --- a/.github/workflows/bcm27xx-bcm2711.yml +++ b/.github/workflows/bcm27xx-bcm2711.yml @@ -20,11 +20,11 @@ env: SOURCE_URL: https://github.com/immortalwrt/immortalwrt SOURCE_BRANCH: openwrt-18.06-k5.4 DIY_SH: scripts/custom.sh - WEBROOT: /data/dnmp/www/openwrt.cc TOOLCHAIN_TAG: toolchain CLASH_BINARY_PLATFORM: armv8 TOOLCHAIN_RELEASE_UPLOAD: true FIRMWARE_RELEASE_UPLOAD: true + WEB_ROOT_PATH: /data/dnmp/www/openwrt.cc TZ: Asia/Shanghai jobs: @@ -378,13 +378,17 @@ jobs: cd $OPENWRT_ROOT_PATH unzip $DEVICE_TARGET-$DEVICE_SUBTARGET.zip + - name: Organize Files + run: | + cd $OPENWRT_ROOT_PATH/bin/targets/$DEVICE_TARGET/$DEVICE_SUBTARGET + rm -rf packages + df -hT $PWD + - name: Deploy Files To HostHatch Node env: HOST: "${{ secrets.REMOTE_USER }}@${{ secrets.HOSTHATCH_IP }}" SOURCE_TARGETS: "${{ env.OPENWRT_ROOT_PATH }}/bin/targets/${{ env.DEVICE_TARGET }}/${{ env.DEVICE_SUBTARGET }}/" - SOURCE_PACKAGES: "${{ env.OPENWRT_ROOT_PATH }}/bin/packages/${{ env.DEVICE_PLATFORM }}/" DEST_TARGETS: "${{ env.WEB_ROOT_PATH }}/snapshots/targets/${{ env.DEVICE_TARGET }}/${{ env.DEVICE_SUBTARGET }}/" - DEST_PACKAGES: "${{ env.WEB_ROOT_PATH }}/snapshots/packages/${{ env.DEVICE_PLATFORM }}/" REMOTE_PRIVATEKEY: "${{ secrets.HOSTHATCH_PRIVATEKEY }}" if: env.REMOTE_PRIVATEKEY != null run: | @@ -396,15 +400,12 @@ jobs: bash -c "'mkdir -p $WEB_ROOT_PATH/snapshots/targets/$DEVICE_TARGET/$DEVICE_SUBTARGET \ $WEB_ROOT_PATH/snapshots/packages/$DEVICE_PLATFORM'" rsync -chavP --delete -e 'ssh -i ~/.ssh/id_rsa -o StrictHostKeyChecking=no' $SOURCE_TARGETS $HOST:$DEST_TARGETS - rsync -chavP --delete -e 'ssh -i ~/.ssh/id_rsa -o StrictHostKeyChecking=no' $SOURCE_PACKAGES $HOST:$DEST_PACKAGES - name: Deploy Files To PacificRack Node env: HOST: "${{ secrets.REMOTE_USER }}@${{ secrets.PACIFICRACK_IP }}" SOURCE_TARGETS: "${{ env.OPENWRT_ROOT_PATH }}/bin/targets/${{ env.DEVICE_TARGET }}/${{ env.DEVICE_SUBTARGET }}/" - SOURCE_PACKAGES: "${{ env.OPENWRT_ROOT_PATH }}/bin/packages/${{ env.DEVICE_PLATFORM }}/" DEST_TARGETS: "${{ env.WEB_ROOT_PATH }}/snapshots/targets/${{ env.DEVICE_TARGET }}/${{ env.DEVICE_SUBTARGET }}/" - DEST_PACKAGES: "${{ env.WEB_ROOT_PATH }}/snapshots/packages/${{ env.DEVICE_PLATFORM }}/" REMOTE_PRIVATEKEY: "${{ secrets.PACIFICRACK_PRIVATEKEY }}" if: env.REMOTE_PRIVATEKEY != null run: | @@ -416,13 +417,6 @@ jobs: bash -c "'mkdir -p $WEB_ROOT_PATH/snapshots/targets/$DEVICE_TARGET/$DEVICE_SUBTARGET \ $WEB_ROOT_PATH/snapshots/packages/$DEVICE_PLATFORM'" rsync -chavP --delete -e 'ssh -i ~/.ssh/id_rsa -o StrictHostKeyChecking=no' $SOURCE_TARGETS $HOST:$DEST_TARGETS - rsync -chavP --delete -e 'ssh -i ~/.ssh/id_rsa -o StrictHostKeyChecking=no' $SOURCE_PACKAGES $HOST:$DEST_PACKAGES - - - name: Organize Files - run: | - cd $OPENWRT_ROOT_PATH/bin/targets/$DEVICE_TARGET/$DEVICE_SUBTARGET - rm -rf packages - df -hT $PWD - name: Deploy Files To Release uses: ncipollo/release-action@v1.8.0 diff --git a/.github/workflows/ipq40xx-generic.yml b/.github/workflows/ipq40xx-generic.yml index 243e55ed2..fa16dbab1 100644 --- a/.github/workflows/ipq40xx-generic.yml +++ b/.github/workflows/ipq40xx-generic.yml @@ -20,11 +20,11 @@ env: SOURCE_URL: https://github.com/immortalwrt/immortalwrt SOURCE_BRANCH: openwrt-18.06-k5.4 DIY_SH: scripts/custom.sh - WEBROOT: /data/dnmp/www/openwrt.cc TOOLCHAIN_TAG: toolchain CLASH_BINARY_PLATFORM: armv7 TOOLCHAIN_RELEASE_UPLOAD: true FIRMWARE_RELEASE_UPLOAD: true + WEB_ROOT_PATH: /data/dnmp/www/openwrt.cc TZ: Asia/Shanghai jobs: @@ -372,13 +372,17 @@ jobs: cd $OPENWRT_ROOT_PATH unzip $DEVICE_TARGET-$DEVICE_SUBTARGET.zip + - name: Organize Files + run: | + cd $OPENWRT_ROOT_PATH/bin/targets/$DEVICE_TARGET/$DEVICE_SUBTARGET + rm -rf packages + df -hT $PWD + - name: Deploy Files To HostHatch Node env: HOST: "${{ secrets.REMOTE_USER }}@${{ secrets.HOSTHATCH_IP }}" SOURCE_TARGETS: "${{ env.OPENWRT_ROOT_PATH }}/bin/targets/${{ env.DEVICE_TARGET }}/${{ env.DEVICE_SUBTARGET }}/" - SOURCE_PACKAGES: "${{ env.OPENWRT_ROOT_PATH }}/bin/packages/${{ env.DEVICE_PLATFORM }}/" DEST_TARGETS: "${{ env.WEB_ROOT_PATH }}/snapshots/targets/${{ env.DEVICE_TARGET }}/${{ env.DEVICE_SUBTARGET }}/" - DEST_PACKAGES: "${{ env.WEB_ROOT_PATH }}/snapshots/packages/${{ env.DEVICE_PLATFORM }}/" REMOTE_PRIVATEKEY: "${{ secrets.HOSTHATCH_PRIVATEKEY }}" if: env.REMOTE_PRIVATEKEY != null run: | @@ -390,15 +394,12 @@ jobs: bash -c "'mkdir -p $WEB_ROOT_PATH/snapshots/targets/$DEVICE_TARGET/$DEVICE_SUBTARGET \ $WEB_ROOT_PATH/snapshots/packages/$DEVICE_PLATFORM'" rsync -chavP --delete -e 'ssh -i ~/.ssh/id_rsa -o StrictHostKeyChecking=no' $SOURCE_TARGETS $HOST:$DEST_TARGETS - rsync -chavP --delete -e 'ssh -i ~/.ssh/id_rsa -o StrictHostKeyChecking=no' $SOURCE_PACKAGES $HOST:$DEST_PACKAGES - name: Deploy Files To PacificRack Node env: HOST: "${{ secrets.REMOTE_USER }}@${{ secrets.PACIFICRACK_IP }}" SOURCE_TARGETS: "${{ env.OPENWRT_ROOT_PATH }}/bin/targets/${{ env.DEVICE_TARGET }}/${{ env.DEVICE_SUBTARGET }}/" - SOURCE_PACKAGES: "${{ env.OPENWRT_ROOT_PATH }}/bin/packages/${{ env.DEVICE_PLATFORM }}/" DEST_TARGETS: "${{ env.WEB_ROOT_PATH }}/snapshots/targets/${{ env.DEVICE_TARGET }}/${{ env.DEVICE_SUBTARGET }}/" - DEST_PACKAGES: "${{ env.WEB_ROOT_PATH }}/snapshots/packages/${{ env.DEVICE_PLATFORM }}/" REMOTE_PRIVATEKEY: "${{ secrets.PACIFICRACK_PRIVATEKEY }}" if: env.REMOTE_PRIVATEKEY != null run: | @@ -410,13 +411,6 @@ jobs: bash -c "'mkdir -p $WEB_ROOT_PATH/snapshots/targets/$DEVICE_TARGET/$DEVICE_SUBTARGET \ $WEB_ROOT_PATH/snapshots/packages/$DEVICE_PLATFORM'" rsync -chavP --delete -e 'ssh -i ~/.ssh/id_rsa -o StrictHostKeyChecking=no' $SOURCE_TARGETS $HOST:$DEST_TARGETS - rsync -chavP --delete -e 'ssh -i ~/.ssh/id_rsa -o StrictHostKeyChecking=no' $SOURCE_PACKAGES $HOST:$DEST_PACKAGES - - - name: Organize Files - run: | - cd $OPENWRT_ROOT_PATH/bin/targets/$DEVICE_TARGET/$DEVICE_SUBTARGET - rm -rf packages - df -hT $PWD - name: Deploy Files To Release uses: ncipollo/release-action@v1.8.0 diff --git a/.github/workflows/rockchip-armv8.yml b/.github/workflows/rockchip-armv8.yml index 20a975a34..6a697e6ca 100644 --- a/.github/workflows/rockchip-armv8.yml +++ b/.github/workflows/rockchip-armv8.yml @@ -20,11 +20,11 @@ env: SOURCE_URL: https://github.com/immortalwrt/immortalwrt SOURCE_BRANCH: openwrt-18.06-k5.4 DIY_SH: scripts/custom.sh - WEBROOT: /data/dnmp/www/openwrt.cc TOOLCHAIN_TAG: toolchain CLASH_BINARY_PLATFORM: armv8 TOOLCHAIN_RELEASE_UPLOAD: true FIRMWARE_RELEASE_UPLOAD: true + WEB_ROOT_PATH: /data/dnmp/www/openwrt.cc TZ: Asia/Shanghai jobs: @@ -375,13 +375,17 @@ jobs: cd $OPENWRT_ROOT_PATH unzip $DEVICE_TARGET-$DEVICE_SUBTARGET.zip + - name: Organize Files + run: | + cd $OPENWRT_ROOT_PATH/bin/targets/$DEVICE_TARGET/$DEVICE_SUBTARGET + rm -rf packages + df -hT $PWD + - name: Deploy Files To HostHatch Node env: HOST: "${{ secrets.REMOTE_USER }}@${{ secrets.HOSTHATCH_IP }}" SOURCE_TARGETS: "${{ env.OPENWRT_ROOT_PATH }}/bin/targets/${{ env.DEVICE_TARGET }}/${{ env.DEVICE_SUBTARGET }}/" - SOURCE_PACKAGES: "${{ env.OPENWRT_ROOT_PATH }}/bin/packages/${{ env.DEVICE_PLATFORM }}/" DEST_TARGETS: "${{ env.WEB_ROOT_PATH }}/snapshots/targets/${{ env.DEVICE_TARGET }}/${{ env.DEVICE_SUBTARGET }}/" - DEST_PACKAGES: "${{ env.WEB_ROOT_PATH }}/snapshots/packages/${{ env.DEVICE_PLATFORM }}/" REMOTE_PRIVATEKEY: "${{ secrets.HOSTHATCH_PRIVATEKEY }}" if: env.REMOTE_PRIVATEKEY != null run: | @@ -393,15 +397,12 @@ jobs: bash -c "'mkdir -p $WEB_ROOT_PATH/snapshots/targets/$DEVICE_TARGET/$DEVICE_SUBTARGET \ $WEB_ROOT_PATH/snapshots/packages/$DEVICE_PLATFORM'" rsync -chavP --delete -e 'ssh -i ~/.ssh/id_rsa -o StrictHostKeyChecking=no' $SOURCE_TARGETS $HOST:$DEST_TARGETS - rsync -chavP --delete -e 'ssh -i ~/.ssh/id_rsa -o StrictHostKeyChecking=no' $SOURCE_PACKAGES $HOST:$DEST_PACKAGES - name: Deploy Files To PacificRack Node env: HOST: "${{ secrets.REMOTE_USER }}@${{ secrets.PACIFICRACK_IP }}" SOURCE_TARGETS: "${{ env.OPENWRT_ROOT_PATH }}/bin/targets/${{ env.DEVICE_TARGET }}/${{ env.DEVICE_SUBTARGET }}/" - SOURCE_PACKAGES: "${{ env.OPENWRT_ROOT_PATH }}/bin/packages/${{ env.DEVICE_PLATFORM }}/" DEST_TARGETS: "${{ env.WEB_ROOT_PATH }}/snapshots/targets/${{ env.DEVICE_TARGET }}/${{ env.DEVICE_SUBTARGET }}/" - DEST_PACKAGES: "${{ env.WEB_ROOT_PATH }}/snapshots/packages/${{ env.DEVICE_PLATFORM }}/" REMOTE_PRIVATEKEY: "${{ secrets.PACIFICRACK_PRIVATEKEY }}" if: env.REMOTE_PRIVATEKEY != null run: | @@ -413,13 +414,6 @@ jobs: bash -c "'mkdir -p $WEB_ROOT_PATH/snapshots/targets/$DEVICE_TARGET/$DEVICE_SUBTARGET \ $WEB_ROOT_PATH/snapshots/packages/$DEVICE_PLATFORM'" rsync -chavP --delete -e 'ssh -i ~/.ssh/id_rsa -o StrictHostKeyChecking=no' $SOURCE_TARGETS $HOST:$DEST_TARGETS - rsync -chavP --delete -e 'ssh -i ~/.ssh/id_rsa -o StrictHostKeyChecking=no' $SOURCE_PACKAGES $HOST:$DEST_PACKAGES - - - name: Organize Files - run: | - cd $OPENWRT_ROOT_PATH/bin/targets/$DEVICE_TARGET/$DEVICE_SUBTARGET - rm -rf packages - df -hT $PWD - name: Deploy Files To Release uses: ncipollo/release-action@v1.8.0 diff --git a/.github/workflows/x86-64.yml b/.github/workflows/x86-64.yml index ba582537a..4108c06fe 100644 --- a/.github/workflows/x86-64.yml +++ b/.github/workflows/x86-64.yml @@ -20,11 +20,11 @@ env: SOURCE_URL: https://github.com/immortalwrt/immortalwrt SOURCE_BRANCH: openwrt-18.06-k5.4 DIY_SH: scripts/custom.sh - WEBROOT: /data/dnmp/www/openwrt.cc TOOLCHAIN_TAG: toolchain CLASH_BINARY_PLATFORM: amd64 TOOLCHAIN_RELEASE_UPLOAD: true FIRMWARE_RELEASE_UPLOAD: true + WEB_ROOT_PATH: /data/dnmp/www/openwrt.cc TZ: Asia/Shanghai jobs: @@ -375,13 +375,17 @@ jobs: cd $OPENWRT_ROOT_PATH unzip $DEVICE_TARGET-$DEVICE_SUBTARGET.zip + - name: Organize Files + run: | + cd $OPENWRT_ROOT_PATH/bin/targets/$DEVICE_TARGET/$DEVICE_SUBTARGET + rm -rf packages + df -hT $PWD + - name: Deploy Files To HostHatch Node env: HOST: "${{ secrets.REMOTE_USER }}@${{ secrets.HOSTHATCH_IP }}" SOURCE_TARGETS: "${{ env.OPENWRT_ROOT_PATH }}/bin/targets/${{ env.DEVICE_TARGET }}/${{ env.DEVICE_SUBTARGET }}/" - SOURCE_PACKAGES: "${{ env.OPENWRT_ROOT_PATH }}/bin/packages/${{ env.DEVICE_PLATFORM }}/" DEST_TARGETS: "${{ env.WEB_ROOT_PATH }}/snapshots/targets/${{ env.DEVICE_TARGET }}/${{ env.DEVICE_SUBTARGET }}/" - DEST_PACKAGES: "${{ env.WEB_ROOT_PATH }}/snapshots/packages/${{ env.DEVICE_PLATFORM }}/" REMOTE_PRIVATEKEY: "${{ secrets.HOSTHATCH_PRIVATEKEY }}" if: env.REMOTE_PRIVATEKEY != null run: | @@ -393,15 +397,12 @@ jobs: bash -c "'mkdir -p $WEB_ROOT_PATH/snapshots/targets/$DEVICE_TARGET/$DEVICE_SUBTARGET \ $WEB_ROOT_PATH/snapshots/packages/$DEVICE_PLATFORM'" rsync -chavP --delete -e 'ssh -i ~/.ssh/id_rsa -o StrictHostKeyChecking=no' $SOURCE_TARGETS $HOST:$DEST_TARGETS - rsync -chavP --delete -e 'ssh -i ~/.ssh/id_rsa -o StrictHostKeyChecking=no' $SOURCE_PACKAGES $HOST:$DEST_PACKAGES - name: Deploy Files To PacificRack Node env: HOST: "${{ secrets.REMOTE_USER }}@${{ secrets.PACIFICRACK_IP }}" SOURCE_TARGETS: "${{ env.OPENWRT_ROOT_PATH }}/bin/targets/${{ env.DEVICE_TARGET }}/${{ env.DEVICE_SUBTARGET }}/" - SOURCE_PACKAGES: "${{ env.OPENWRT_ROOT_PATH }}/bin/packages/${{ env.DEVICE_PLATFORM }}/" DEST_TARGETS: "${{ env.WEB_ROOT_PATH }}/snapshots/targets/${{ env.DEVICE_TARGET }}/${{ env.DEVICE_SUBTARGET }}/" - DEST_PACKAGES: "${{ env.WEB_ROOT_PATH }}/snapshots/packages/${{ env.DEVICE_PLATFORM }}/" REMOTE_PRIVATEKEY: "${{ secrets.PACIFICRACK_PRIVATEKEY }}" if: env.REMOTE_PRIVATEKEY != null run: | @@ -413,13 +414,6 @@ jobs: bash -c "'mkdir -p $WEB_ROOT_PATH/snapshots/targets/$DEVICE_TARGET/$DEVICE_SUBTARGET \ $WEB_ROOT_PATH/snapshots/packages/$DEVICE_PLATFORM'" rsync -chavP --delete -e 'ssh -i ~/.ssh/id_rsa -o StrictHostKeyChecking=no' $SOURCE_TARGETS $HOST:$DEST_TARGETS - rsync -chavP --delete -e 'ssh -i ~/.ssh/id_rsa -o StrictHostKeyChecking=no' $SOURCE_PACKAGES $HOST:$DEST_PACKAGES - - - name: Organize Files - run: | - cd $OPENWRT_ROOT_PATH/bin/targets/$DEVICE_TARGET/$DEVICE_SUBTARGET - rm -rf packages - df -hT $PWD - name: Deploy Files To Release uses: ncipollo/release-action@v1.8.0