Skip to content
This repository was archived by the owner on May 3, 2023. It is now read-only.

Commit 2e978e2

Browse files
SuLingGGSuLingGG
committed
Workflows: Remove non-shared packages before upload
Workflows: Fix WEB_ROOT_PATH env name
1 parent a6f2d2a commit 2e978e2

7 files changed

Lines changed: 49 additions & 91 deletions

File tree

‎.github/workflows/bcm27xx-bcm2708.yml‎

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ env:
2020
SOURCE_URL: https://github.com/immortalwrt/immortalwrt
2121
SOURCE_BRANCH: openwrt-18.06-k5.4
2222
DIY_SH: scripts/custom.sh
23-
WEBROOT: /data/dnmp/www/openwrt.cc
2423
TOOLCHAIN_TAG: toolchain
2524
CLASH_BINARY_PLATFORM: armv6
2625
TOOLCHAIN_RELEASE_UPLOAD: true
2726
FIRMWARE_RELEASE_UPLOAD: true
27+
WEB_ROOT_PATH: /data/dnmp/www/openwrt.cc
2828
TZ: Asia/Shanghai
2929

3030
jobs:
@@ -376,13 +376,17 @@ jobs:
376376
cd $OPENWRT_ROOT_PATH
377377
unzip $DEVICE_TARGET-$DEVICE_SUBTARGET.zip
378378
379+
- name: Organize Files
380+
run: |
381+
cd $OPENWRT_ROOT_PATH/bin/targets/$DEVICE_TARGET/$DEVICE_SUBTARGET
382+
rm -rf packages
383+
df -hT $PWD
384+
379385
- name: Deploy Files To HostHatch Node
380386
env:
381387
HOST: "${{ secrets.REMOTE_USER }}@${{ secrets.HOSTHATCH_IP }}"
382388
SOURCE_TARGETS: "${{ env.OPENWRT_ROOT_PATH }}/bin/targets/${{ env.DEVICE_TARGET }}/${{ env.DEVICE_SUBTARGET }}/"
383-
SOURCE_PACKAGES: "${{ env.OPENWRT_ROOT_PATH }}/bin/packages/${{ env.DEVICE_PLATFORM }}/"
384389
DEST_TARGETS: "${{ env.WEB_ROOT_PATH }}/snapshots/targets/${{ env.DEVICE_TARGET }}/${{ env.DEVICE_SUBTARGET }}/"
385-
DEST_PACKAGES: "${{ env.WEB_ROOT_PATH }}/snapshots/packages/${{ env.DEVICE_PLATFORM }}/"
386390
REMOTE_PRIVATEKEY: "${{ secrets.HOSTHATCH_PRIVATEKEY }}"
387391
if: env.REMOTE_PRIVATEKEY != null
388392
run: |
@@ -394,15 +398,12 @@ jobs:
394398
bash -c "'mkdir -p $WEB_ROOT_PATH/snapshots/targets/$DEVICE_TARGET/$DEVICE_SUBTARGET \
395399
$WEB_ROOT_PATH/snapshots/packages/$DEVICE_PLATFORM'"
396400
rsync -chavP --delete -e 'ssh -i ~/.ssh/id_rsa -o StrictHostKeyChecking=no' $SOURCE_TARGETS $HOST:$DEST_TARGETS
397-
rsync -chavP --delete -e 'ssh -i ~/.ssh/id_rsa -o StrictHostKeyChecking=no' $SOURCE_PACKAGES $HOST:$DEST_PACKAGES
398401
399402
- name: Deploy Files To PacificRack Node
400403
env:
401404
HOST: "${{ secrets.REMOTE_USER }}@${{ secrets.PACIFICRACK_IP }}"
402405
SOURCE_TARGETS: "${{ env.OPENWRT_ROOT_PATH }}/bin/targets/${{ env.DEVICE_TARGET }}/${{ env.DEVICE_SUBTARGET }}/"
403-
SOURCE_PACKAGES: "${{ env.OPENWRT_ROOT_PATH }}/bin/packages/${{ env.DEVICE_PLATFORM }}/"
404406
DEST_TARGETS: "${{ env.WEB_ROOT_PATH }}/snapshots/targets/${{ env.DEVICE_TARGET }}/${{ env.DEVICE_SUBTARGET }}/"
405-
DEST_PACKAGES: "${{ env.WEB_ROOT_PATH }}/snapshots/packages/${{ env.DEVICE_PLATFORM }}/"
406407
REMOTE_PRIVATEKEY: "${{ secrets.PACIFICRACK_PRIVATEKEY }}"
407408
if: env.REMOTE_PRIVATEKEY != null
408409
run: |
@@ -414,13 +415,6 @@ jobs:
414415
bash -c "'mkdir -p $WEB_ROOT_PATH/snapshots/targets/$DEVICE_TARGET/$DEVICE_SUBTARGET \
415416
$WEB_ROOT_PATH/snapshots/packages/$DEVICE_PLATFORM'"
416417
rsync -chavP --delete -e 'ssh -i ~/.ssh/id_rsa -o StrictHostKeyChecking=no' $SOURCE_TARGETS $HOST:$DEST_TARGETS
417-
rsync -chavP --delete -e 'ssh -i ~/.ssh/id_rsa -o StrictHostKeyChecking=no' $SOURCE_PACKAGES $HOST:$DEST_PACKAGES
418-
419-
- name: Organize Files
420-
run: |
421-
cd $OPENWRT_ROOT_PATH/bin/targets/$DEVICE_TARGET/$DEVICE_SUBTARGET
422-
rm -rf packages
423-
df -hT $PWD
424418
425419
- name: Deploy Files To Release
426420
uses: ncipollo/release-action@v1.8.0

‎.github/workflows/bcm27xx-bcm2709.yml‎

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ env:
2020
SOURCE_URL: https://github.com/immortalwrt/immortalwrt
2121
SOURCE_BRANCH: openwrt-18.06-k5.4
2222
DIY_SH: scripts/custom.sh
23-
WEBROOT: /data/dnmp/www/openwrt.cc
2423
TOOLCHAIN_TAG: toolchain
2524
CLASH_BINARY_PLATFORM: armv7
2625
TOOLCHAIN_RELEASE_UPLOAD: true
2726
FIRMWARE_RELEASE_UPLOAD: true
27+
WEB_ROOT_PATH: /data/dnmp/www/openwrt.cc
2828
TZ: Asia/Shanghai
2929

3030
jobs:
@@ -376,13 +376,17 @@ jobs:
376376
cd $OPENWRT_ROOT_PATH
377377
unzip $DEVICE_TARGET-$DEVICE_SUBTARGET.zip
378378
379+
- name: Organize Files
380+
run: |
381+
cd $OPENWRT_ROOT_PATH/bin/targets/$DEVICE_TARGET/$DEVICE_SUBTARGET
382+
rm -rf packages
383+
df -hT $PWD
384+
379385
- name: Deploy Files To HostHatch Node
380386
env:
381387
HOST: "${{ secrets.REMOTE_USER }}@${{ secrets.HOSTHATCH_IP }}"
382388
SOURCE_TARGETS: "${{ env.OPENWRT_ROOT_PATH }}/bin/targets/${{ env.DEVICE_TARGET }}/${{ env.DEVICE_SUBTARGET }}/"
383-
SOURCE_PACKAGES: "${{ env.OPENWRT_ROOT_PATH }}/bin/packages/${{ env.DEVICE_PLATFORM }}/"
384389
DEST_TARGETS: "${{ env.WEB_ROOT_PATH }}/snapshots/targets/${{ env.DEVICE_TARGET }}/${{ env.DEVICE_SUBTARGET }}/"
385-
DEST_PACKAGES: "${{ env.WEB_ROOT_PATH }}/snapshots/packages/${{ env.DEVICE_PLATFORM }}/"
386390
REMOTE_PRIVATEKEY: "${{ secrets.HOSTHATCH_PRIVATEKEY }}"
387391
if: env.REMOTE_PRIVATEKEY != null
388392
run: |
@@ -394,15 +398,12 @@ jobs:
394398
bash -c "'mkdir -p $WEB_ROOT_PATH/snapshots/targets/$DEVICE_TARGET/$DEVICE_SUBTARGET \
395399
$WEB_ROOT_PATH/snapshots/packages/$DEVICE_PLATFORM'"
396400
rsync -chavP --delete -e 'ssh -i ~/.ssh/id_rsa -o StrictHostKeyChecking=no' $SOURCE_TARGETS $HOST:$DEST_TARGETS
397-
rsync -chavP --delete -e 'ssh -i ~/.ssh/id_rsa -o StrictHostKeyChecking=no' $SOURCE_PACKAGES $HOST:$DEST_PACKAGES
398401
399402
- name: Deploy Files To PacificRack Node
400403
env:
401404
HOST: "${{ secrets.REMOTE_USER }}@${{ secrets.PACIFICRACK_IP }}"
402405
SOURCE_TARGETS: "${{ env.OPENWRT_ROOT_PATH }}/bin/targets/${{ env.DEVICE_TARGET }}/${{ env.DEVICE_SUBTARGET }}/"
403-
SOURCE_PACKAGES: "${{ env.OPENWRT_ROOT_PATH }}/bin/packages/${{ env.DEVICE_PLATFORM }}/"
404406
DEST_TARGETS: "${{ env.WEB_ROOT_PATH }}/snapshots/targets/${{ env.DEVICE_TARGET }}/${{ env.DEVICE_SUBTARGET }}/"
405-
DEST_PACKAGES: "${{ env.WEB_ROOT_PATH }}/snapshots/packages/${{ env.DEVICE_PLATFORM }}/"
406407
REMOTE_PRIVATEKEY: "${{ secrets.PACIFICRACK_PRIVATEKEY }}"
407408
if: env.REMOTE_PRIVATEKEY != null
408409
run: |
@@ -414,13 +415,6 @@ jobs:
414415
bash -c "'mkdir -p $WEB_ROOT_PATH/snapshots/targets/$DEVICE_TARGET/$DEVICE_SUBTARGET \
415416
$WEB_ROOT_PATH/snapshots/packages/$DEVICE_PLATFORM'"
416417
rsync -chavP --delete -e 'ssh -i ~/.ssh/id_rsa -o StrictHostKeyChecking=no' $SOURCE_TARGETS $HOST:$DEST_TARGETS
417-
rsync -chavP --delete -e 'ssh -i ~/.ssh/id_rsa -o StrictHostKeyChecking=no' $SOURCE_PACKAGES $HOST:$DEST_PACKAGES
418-
419-
- name: Organize Files
420-
run: |
421-
cd $OPENWRT_ROOT_PATH/bin/targets/$DEVICE_TARGET/$DEVICE_SUBTARGET
422-
rm -rf packages
423-
df -hT $PWD
424418
425419
- name: Deploy Files To Release
426420
uses: ncipollo/release-action@v1.8.0

‎.github/workflows/bcm27xx-bcm2710.yml‎

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ env:
2020
SOURCE_URL: https://github.com/immortalwrt/immortalwrt
2121
SOURCE_BRANCH: openwrt-18.06-k5.4
2222
DIY_SH: scripts/custom.sh
23-
WEBROOT: /data/dnmp/www/openwrt.cc
2423
TOOLCHAIN_TAG: toolchain
2524
CLASH_BINARY_PLATFORM: armv8
2625
TOOLCHAIN_RELEASE_UPLOAD: true
2726
FIRMWARE_RELEASE_UPLOAD: true
27+
WEB_ROOT_PATH: /data/dnmp/www/openwrt.cc
2828
TZ: Asia/Shanghai
2929

3030
jobs:
@@ -376,13 +376,17 @@ jobs:
376376
cd $OPENWRT_ROOT_PATH
377377
unzip $DEVICE_TARGET-$DEVICE_SUBTARGET.zip
378378
379+
- name: Organize Files
380+
run: |
381+
cd $OPENWRT_ROOT_PATH/bin/targets/$DEVICE_TARGET/$DEVICE_SUBTARGET
382+
rm -rf packages
383+
df -hT $PWD
384+
379385
- name: Deploy Files To HostHatch Node
380386
env:
381387
HOST: "${{ secrets.REMOTE_USER }}@${{ secrets.HOSTHATCH_IP }}"
382388
SOURCE_TARGETS: "${{ env.OPENWRT_ROOT_PATH }}/bin/targets/${{ env.DEVICE_TARGET }}/${{ env.DEVICE_SUBTARGET }}/"
383-
SOURCE_PACKAGES: "${{ env.OPENWRT_ROOT_PATH }}/bin/packages/${{ env.DEVICE_PLATFORM }}/"
384389
DEST_TARGETS: "${{ env.WEB_ROOT_PATH }}/snapshots/targets/${{ env.DEVICE_TARGET }}/${{ env.DEVICE_SUBTARGET }}/"
385-
DEST_PACKAGES: "${{ env.WEB_ROOT_PATH }}/snapshots/packages/${{ env.DEVICE_PLATFORM }}/"
386390
REMOTE_PRIVATEKEY: "${{ secrets.HOSTHATCH_PRIVATEKEY }}"
387391
if: env.REMOTE_PRIVATEKEY != null
388392
run: |
@@ -394,15 +398,12 @@ jobs:
394398
bash -c "'mkdir -p $WEB_ROOT_PATH/snapshots/targets/$DEVICE_TARGET/$DEVICE_SUBTARGET \
395399
$WEB_ROOT_PATH/snapshots/packages/$DEVICE_PLATFORM'"
396400
rsync -chavP --delete -e 'ssh -i ~/.ssh/id_rsa -o StrictHostKeyChecking=no' $SOURCE_TARGETS $HOST:$DEST_TARGETS
397-
rsync -chavP --delete -e 'ssh -i ~/.ssh/id_rsa -o StrictHostKeyChecking=no' $SOURCE_PACKAGES $HOST:$DEST_PACKAGES
398401
399402
- name: Deploy Files To PacificRack Node
400403
env:
401404
HOST: "${{ secrets.REMOTE_USER }}@${{ secrets.PACIFICRACK_IP }}"
402405
SOURCE_TARGETS: "${{ env.OPENWRT_ROOT_PATH }}/bin/targets/${{ env.DEVICE_TARGET }}/${{ env.DEVICE_SUBTARGET }}/"
403-
SOURCE_PACKAGES: "${{ env.OPENWRT_ROOT_PATH }}/bin/packages/${{ env.DEVICE_PLATFORM }}/"
404406
DEST_TARGETS: "${{ env.WEB_ROOT_PATH }}/snapshots/targets/${{ env.DEVICE_TARGET }}/${{ env.DEVICE_SUBTARGET }}/"
405-
DEST_PACKAGES: "${{ env.WEB_ROOT_PATH }}/snapshots/packages/${{ env.DEVICE_PLATFORM }}/"
406407
REMOTE_PRIVATEKEY: "${{ secrets.PACIFICRACK_PRIVATEKEY }}"
407408
if: env.REMOTE_PRIVATEKEY != null
408409
run: |
@@ -414,13 +415,6 @@ jobs:
414415
bash -c "'mkdir -p $WEB_ROOT_PATH/snapshots/targets/$DEVICE_TARGET/$DEVICE_SUBTARGET \
415416
$WEB_ROOT_PATH/snapshots/packages/$DEVICE_PLATFORM'"
416417
rsync -chavP --delete -e 'ssh -i ~/.ssh/id_rsa -o StrictHostKeyChecking=no' $SOURCE_TARGETS $HOST:$DEST_TARGETS
417-
rsync -chavP --delete -e 'ssh -i ~/.ssh/id_rsa -o StrictHostKeyChecking=no' $SOURCE_PACKAGES $HOST:$DEST_PACKAGES
418-
419-
- name: Organize Files
420-
run: |
421-
cd $OPENWRT_ROOT_PATH/bin/targets/$DEVICE_TARGET/$DEVICE_SUBTARGET
422-
rm -rf packages
423-
df -hT $PWD
424418
425419
- name: Deploy Files To Release
426420
uses: ncipollo/release-action@v1.8.0

‎.github/workflows/bcm27xx-bcm2711.yml‎

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ env:
2020
SOURCE_URL: https://github.com/immortalwrt/immortalwrt
2121
SOURCE_BRANCH: openwrt-18.06-k5.4
2222
DIY_SH: scripts/custom.sh
23-
WEBROOT: /data/dnmp/www/openwrt.cc
2423
TOOLCHAIN_TAG: toolchain
2524
CLASH_BINARY_PLATFORM: armv8
2625
TOOLCHAIN_RELEASE_UPLOAD: true
2726
FIRMWARE_RELEASE_UPLOAD: true
27+
WEB_ROOT_PATH: /data/dnmp/www/openwrt.cc
2828
TZ: Asia/Shanghai
2929

3030
jobs:
@@ -378,13 +378,17 @@ jobs:
378378
cd $OPENWRT_ROOT_PATH
379379
unzip $DEVICE_TARGET-$DEVICE_SUBTARGET.zip
380380
381+
- name: Organize Files
382+
run: |
383+
cd $OPENWRT_ROOT_PATH/bin/targets/$DEVICE_TARGET/$DEVICE_SUBTARGET
384+
rm -rf packages
385+
df -hT $PWD
386+
381387
- name: Deploy Files To HostHatch Node
382388
env:
383389
HOST: "${{ secrets.REMOTE_USER }}@${{ secrets.HOSTHATCH_IP }}"
384390
SOURCE_TARGETS: "${{ env.OPENWRT_ROOT_PATH }}/bin/targets/${{ env.DEVICE_TARGET }}/${{ env.DEVICE_SUBTARGET }}/"
385-
SOURCE_PACKAGES: "${{ env.OPENWRT_ROOT_PATH }}/bin/packages/${{ env.DEVICE_PLATFORM }}/"
386391
DEST_TARGETS: "${{ env.WEB_ROOT_PATH }}/snapshots/targets/${{ env.DEVICE_TARGET }}/${{ env.DEVICE_SUBTARGET }}/"
387-
DEST_PACKAGES: "${{ env.WEB_ROOT_PATH }}/snapshots/packages/${{ env.DEVICE_PLATFORM }}/"
388392
REMOTE_PRIVATEKEY: "${{ secrets.HOSTHATCH_PRIVATEKEY }}"
389393
if: env.REMOTE_PRIVATEKEY != null
390394
run: |
@@ -396,15 +400,12 @@ jobs:
396400
bash -c "'mkdir -p $WEB_ROOT_PATH/snapshots/targets/$DEVICE_TARGET/$DEVICE_SUBTARGET \
397401
$WEB_ROOT_PATH/snapshots/packages/$DEVICE_PLATFORM'"
398402
rsync -chavP --delete -e 'ssh -i ~/.ssh/id_rsa -o StrictHostKeyChecking=no' $SOURCE_TARGETS $HOST:$DEST_TARGETS
399-
rsync -chavP --delete -e 'ssh -i ~/.ssh/id_rsa -o StrictHostKeyChecking=no' $SOURCE_PACKAGES $HOST:$DEST_PACKAGES
400403
401404
- name: Deploy Files To PacificRack Node
402405
env:
403406
HOST: "${{ secrets.REMOTE_USER }}@${{ secrets.PACIFICRACK_IP }}"
404407
SOURCE_TARGETS: "${{ env.OPENWRT_ROOT_PATH }}/bin/targets/${{ env.DEVICE_TARGET }}/${{ env.DEVICE_SUBTARGET }}/"
405-
SOURCE_PACKAGES: "${{ env.OPENWRT_ROOT_PATH }}/bin/packages/${{ env.DEVICE_PLATFORM }}/"
406408
DEST_TARGETS: "${{ env.WEB_ROOT_PATH }}/snapshots/targets/${{ env.DEVICE_TARGET }}/${{ env.DEVICE_SUBTARGET }}/"
407-
DEST_PACKAGES: "${{ env.WEB_ROOT_PATH }}/snapshots/packages/${{ env.DEVICE_PLATFORM }}/"
408409
REMOTE_PRIVATEKEY: "${{ secrets.PACIFICRACK_PRIVATEKEY }}"
409410
if: env.REMOTE_PRIVATEKEY != null
410411
run: |
@@ -416,13 +417,6 @@ jobs:
416417
bash -c "'mkdir -p $WEB_ROOT_PATH/snapshots/targets/$DEVICE_TARGET/$DEVICE_SUBTARGET \
417418
$WEB_ROOT_PATH/snapshots/packages/$DEVICE_PLATFORM'"
418419
rsync -chavP --delete -e 'ssh -i ~/.ssh/id_rsa -o StrictHostKeyChecking=no' $SOURCE_TARGETS $HOST:$DEST_TARGETS
419-
rsync -chavP --delete -e 'ssh -i ~/.ssh/id_rsa -o StrictHostKeyChecking=no' $SOURCE_PACKAGES $HOST:$DEST_PACKAGES
420-
421-
- name: Organize Files
422-
run: |
423-
cd $OPENWRT_ROOT_PATH/bin/targets/$DEVICE_TARGET/$DEVICE_SUBTARGET
424-
rm -rf packages
425-
df -hT $PWD
426420
427421
- name: Deploy Files To Release
428422
uses: ncipollo/release-action@v1.8.0

‎.github/workflows/ipq40xx-generic.yml‎

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ env:
2020
SOURCE_URL: https://github.com/immortalwrt/immortalwrt
2121
SOURCE_BRANCH: openwrt-18.06-k5.4
2222
DIY_SH: scripts/custom.sh
23-
WEBROOT: /data/dnmp/www/openwrt.cc
2423
TOOLCHAIN_TAG: toolchain
2524
CLASH_BINARY_PLATFORM: armv7
2625
TOOLCHAIN_RELEASE_UPLOAD: true
2726
FIRMWARE_RELEASE_UPLOAD: true
27+
WEB_ROOT_PATH: /data/dnmp/www/openwrt.cc
2828
TZ: Asia/Shanghai
2929

3030
jobs:
@@ -372,13 +372,17 @@ jobs:
372372
cd $OPENWRT_ROOT_PATH
373373
unzip $DEVICE_TARGET-$DEVICE_SUBTARGET.zip
374374
375+
- name: Organize Files
376+
run: |
377+
cd $OPENWRT_ROOT_PATH/bin/targets/$DEVICE_TARGET/$DEVICE_SUBTARGET
378+
rm -rf packages
379+
df -hT $PWD
380+
375381
- name: Deploy Files To HostHatch Node
376382
env:
377383
HOST: "${{ secrets.REMOTE_USER }}@${{ secrets.HOSTHATCH_IP }}"
378384
SOURCE_TARGETS: "${{ env.OPENWRT_ROOT_PATH }}/bin/targets/${{ env.DEVICE_TARGET }}/${{ env.DEVICE_SUBTARGET }}/"
379-
SOURCE_PACKAGES: "${{ env.OPENWRT_ROOT_PATH }}/bin/packages/${{ env.DEVICE_PLATFORM }}/"
380385
DEST_TARGETS: "${{ env.WEB_ROOT_PATH }}/snapshots/targets/${{ env.DEVICE_TARGET }}/${{ env.DEVICE_SUBTARGET }}/"
381-
DEST_PACKAGES: "${{ env.WEB_ROOT_PATH }}/snapshots/packages/${{ env.DEVICE_PLATFORM }}/"
382386
REMOTE_PRIVATEKEY: "${{ secrets.HOSTHATCH_PRIVATEKEY }}"
383387
if: env.REMOTE_PRIVATEKEY != null
384388
run: |
@@ -390,15 +394,12 @@ jobs:
390394
bash -c "'mkdir -p $WEB_ROOT_PATH/snapshots/targets/$DEVICE_TARGET/$DEVICE_SUBTARGET \
391395
$WEB_ROOT_PATH/snapshots/packages/$DEVICE_PLATFORM'"
392396
rsync -chavP --delete -e 'ssh -i ~/.ssh/id_rsa -o StrictHostKeyChecking=no' $SOURCE_TARGETS $HOST:$DEST_TARGETS
393-
rsync -chavP --delete -e 'ssh -i ~/.ssh/id_rsa -o StrictHostKeyChecking=no' $SOURCE_PACKAGES $HOST:$DEST_PACKAGES
394397
395398
- name: Deploy Files To PacificRack Node
396399
env:
397400
HOST: "${{ secrets.REMOTE_USER }}@${{ secrets.PACIFICRACK_IP }}"
398401
SOURCE_TARGETS: "${{ env.OPENWRT_ROOT_PATH }}/bin/targets/${{ env.DEVICE_TARGET }}/${{ env.DEVICE_SUBTARGET }}/"
399-
SOURCE_PACKAGES: "${{ env.OPENWRT_ROOT_PATH }}/bin/packages/${{ env.DEVICE_PLATFORM }}/"
400402
DEST_TARGETS: "${{ env.WEB_ROOT_PATH }}/snapshots/targets/${{ env.DEVICE_TARGET }}/${{ env.DEVICE_SUBTARGET }}/"
401-
DEST_PACKAGES: "${{ env.WEB_ROOT_PATH }}/snapshots/packages/${{ env.DEVICE_PLATFORM }}/"
402403
REMOTE_PRIVATEKEY: "${{ secrets.PACIFICRACK_PRIVATEKEY }}"
403404
if: env.REMOTE_PRIVATEKEY != null
404405
run: |
@@ -410,13 +411,6 @@ jobs:
410411
bash -c "'mkdir -p $WEB_ROOT_PATH/snapshots/targets/$DEVICE_TARGET/$DEVICE_SUBTARGET \
411412
$WEB_ROOT_PATH/snapshots/packages/$DEVICE_PLATFORM'"
412413
rsync -chavP --delete -e 'ssh -i ~/.ssh/id_rsa -o StrictHostKeyChecking=no' $SOURCE_TARGETS $HOST:$DEST_TARGETS
413-
rsync -chavP --delete -e 'ssh -i ~/.ssh/id_rsa -o StrictHostKeyChecking=no' $SOURCE_PACKAGES $HOST:$DEST_PACKAGES
414-
415-
- name: Organize Files
416-
run: |
417-
cd $OPENWRT_ROOT_PATH/bin/targets/$DEVICE_TARGET/$DEVICE_SUBTARGET
418-
rm -rf packages
419-
df -hT $PWD
420414
421415
- name: Deploy Files To Release
422416
uses: ncipollo/release-action@v1.8.0

‎.github/workflows/rockchip-armv8.yml‎

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ env:
2020
SOURCE_URL: https://github.com/immortalwrt/immortalwrt
2121
SOURCE_BRANCH: openwrt-18.06-k5.4
2222
DIY_SH: scripts/custom.sh
23-
WEBROOT: /data/dnmp/www/openwrt.cc
2423
TOOLCHAIN_TAG: toolchain
2524
CLASH_BINARY_PLATFORM: armv8
2625
TOOLCHAIN_RELEASE_UPLOAD: true
2726
FIRMWARE_RELEASE_UPLOAD: true
27+
WEB_ROOT_PATH: /data/dnmp/www/openwrt.cc
2828
TZ: Asia/Shanghai
2929

3030
jobs:
@@ -375,13 +375,17 @@ jobs:
375375
cd $OPENWRT_ROOT_PATH
376376
unzip $DEVICE_TARGET-$DEVICE_SUBTARGET.zip
377377
378+
- name: Organize Files
379+
run: |
380+
cd $OPENWRT_ROOT_PATH/bin/targets/$DEVICE_TARGET/$DEVICE_SUBTARGET
381+
rm -rf packages
382+
df -hT $PWD
383+
378384
- name: Deploy Files To HostHatch Node
379385
env:
380386
HOST: "${{ secrets.REMOTE_USER }}@${{ secrets.HOSTHATCH_IP }}"
381387
SOURCE_TARGETS: "${{ env.OPENWRT_ROOT_PATH }}/bin/targets/${{ env.DEVICE_TARGET }}/${{ env.DEVICE_SUBTARGET }}/"
382-
SOURCE_PACKAGES: "${{ env.OPENWRT_ROOT_PATH }}/bin/packages/${{ env.DEVICE_PLATFORM }}/"
383388
DEST_TARGETS: "${{ env.WEB_ROOT_PATH }}/snapshots/targets/${{ env.DEVICE_TARGET }}/${{ env.DEVICE_SUBTARGET }}/"
384-
DEST_PACKAGES: "${{ env.WEB_ROOT_PATH }}/snapshots/packages/${{ env.DEVICE_PLATFORM }}/"
385389
REMOTE_PRIVATEKEY: "${{ secrets.HOSTHATCH_PRIVATEKEY }}"
386390
if: env.REMOTE_PRIVATEKEY != null
387391
run: |
@@ -393,15 +397,12 @@ jobs:
393397
bash -c "'mkdir -p $WEB_ROOT_PATH/snapshots/targets/$DEVICE_TARGET/$DEVICE_SUBTARGET \
394398
$WEB_ROOT_PATH/snapshots/packages/$DEVICE_PLATFORM'"
395399
rsync -chavP --delete -e 'ssh -i ~/.ssh/id_rsa -o StrictHostKeyChecking=no' $SOURCE_TARGETS $HOST:$DEST_TARGETS
396-
rsync -chavP --delete -e 'ssh -i ~/.ssh/id_rsa -o StrictHostKeyChecking=no' $SOURCE_PACKAGES $HOST:$DEST_PACKAGES
397400
398401
- name: Deploy Files To PacificRack Node
399402
env:
400403
HOST: "${{ secrets.REMOTE_USER }}@${{ secrets.PACIFICRACK_IP }}"
401404
SOURCE_TARGETS: "${{ env.OPENWRT_ROOT_PATH }}/bin/targets/${{ env.DEVICE_TARGET }}/${{ env.DEVICE_SUBTARGET }}/"
402-
SOURCE_PACKAGES: "${{ env.OPENWRT_ROOT_PATH }}/bin/packages/${{ env.DEVICE_PLATFORM }}/"
403405
DEST_TARGETS: "${{ env.WEB_ROOT_PATH }}/snapshots/targets/${{ env.DEVICE_TARGET }}/${{ env.DEVICE_SUBTARGET }}/"
404-
DEST_PACKAGES: "${{ env.WEB_ROOT_PATH }}/snapshots/packages/${{ env.DEVICE_PLATFORM }}/"
405406
REMOTE_PRIVATEKEY: "${{ secrets.PACIFICRACK_PRIVATEKEY }}"
406407
if: env.REMOTE_PRIVATEKEY != null
407408
run: |
@@ -413,13 +414,6 @@ jobs:
413414
bash -c "'mkdir -p $WEB_ROOT_PATH/snapshots/targets/$DEVICE_TARGET/$DEVICE_SUBTARGET \
414415
$WEB_ROOT_PATH/snapshots/packages/$DEVICE_PLATFORM'"
415416
rsync -chavP --delete -e 'ssh -i ~/.ssh/id_rsa -o StrictHostKeyChecking=no' $SOURCE_TARGETS $HOST:$DEST_TARGETS
416-
rsync -chavP --delete -e 'ssh -i ~/.ssh/id_rsa -o StrictHostKeyChecking=no' $SOURCE_PACKAGES $HOST:$DEST_PACKAGES
417-
418-
- name: Organize Files
419-
run: |
420-
cd $OPENWRT_ROOT_PATH/bin/targets/$DEVICE_TARGET/$DEVICE_SUBTARGET
421-
rm -rf packages
422-
df -hT $PWD
423417
424418
- name: Deploy Files To Release
425419
uses: ncipollo/release-action@v1.8.0

0 commit comments

Comments
 (0)