fix image size

re-order scripts
stupidloud · Sep 6, 2020 · d2b7193 · d2b7193
1 parent cc12858
commit d2b7193
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/.github/workflows/r1s_lean_h3.yml b/.github/workflows/r1s_lean_h3.yml
@@ -64,9 +64,6 @@ jobs:
       - name: Build FriendlyWrt
         run: . 4_build_image.sh friendlywrt-h3 nanopi_r1s_h3.mk
 
-      - name: Zip Files
-        run: |
-          gzip friendlywrt-h3/out/*.img
       - name: Assemble Artifact
         id: assemble_artifact
         run: |

diff --git a/.github/workflows/r1s_lienol.yml b/.github/workflows/r1s_lienol.yml
@@ -48,13 +48,13 @@ jobs:
 
       - name: Mods
         run: |
+        git config --local user.email "action@github.com" && git config --local user.name "GitHub Action"
           cd friendlywrt-h5
           . ../remove_unused_config.sh
           cat ../app_config.seed >> configs/config_h5
           #echo '# CONFIG_V2RAY_COMPRESS_UPX is not set' >> configs/config_h5
           sed -i '/docker/Id;/containerd/Id;/runc/Id;/iptparser/Id' configs/config_h5 #fix compile error
           cd friendlywrt
-          git config --local user.email "action@github.com" && git config --local user.name "GitHub Action"
           git remote add upstream https://github.com/Lienol/openwrt && git fetch upstream
           git checkout upstream/dev-19.07 -b tmp
           git mv README.md README && git commit -m 'undo rename readme for rebasing'

diff --git a/.github/workflows/r2s_lienol.yml b/.github/workflows/r2s_lienol.yml
@@ -52,14 +52,14 @@ jobs:
 
       - name: Mods
         run: |
+          git config --local user.email "action@github.com" && git config --local user.name "GitHub Action"
           cd friendlywrt-rk3328
           . ../remove_unused_config.sh
           cat configs/config_rk3328 | grep "TARGET" >> ../base_rk3328.seed
           cat ../app_config.seed >> ../base_rk3328.seed
           cat ../base_rk3328.seed > configs/config_rk3328
           echo 'CONFIG_KERNEL_CGROUPS=y' >> configs/config_rk3328
           cd friendlywrt
-          git config --local user.email "action@github.com" && git config --local user.name "GitHub Action"
           git remote add upstream https://github.com/Lienol/openwrt && git fetch upstream
           git checkout upstream/dev-19.07 -b tmp
           git mv README.md README && git commit -m 'undo rename readme for rebasing'

diff --git a/4_build_image.sh b/4_build_image.sh
@@ -3,10 +3,13 @@ cd friendlywrt
 ./scripts/feeds update -a && ./scripts/feeds install -a
 sed -i '/STAMP_BUILT/d' feeds/packages/utils/runc/Makefile feeds/packages/utils/containerd/Makefile #fix compile error
 cd ..
+
 echo -e '\nCONFIG_TCP_CONG_ADVANCED=y' >> kernel/arch/arm/configs/sunxi_defconfig
 echo -e '\nCONFIG_TCP_CONG_BBR=m' >> kernel/arch/arm/configs/sunxi_defconfig
 sed -i 's/set -eu/set -u/' scripts/mk-friendlywrt.sh
+sed -i 's/640/1000/' scripts/sd-fuse/mk-sd-image.sh
 ./build.sh $2
+
 LOOP_DEVICE=$(losetup -f)
 sudo losetup -o 100663296 ${LOOP_DEVICE} out/*.img
 sudo rm -rf /mnt/friendlywrt-tmp && sudo mkdir -p /mnt/friendlywrt-tmp