diff --git a/.github/workflows/AutoBuild.yml b/.github/workflows/AutoBuild.yml index 5d3c928..b85ced3 100644 --- a/.github/workflows/AutoBuild.yml +++ b/.github/workflows/AutoBuild.yml @@ -1,6 +1,6 @@ #======================================================= # Description: Build OpenWrt using GitHub Actions -# Github: https://github.com/Hyy2001X/AutoBuild-Actions +# https://github.com/Hyy2001X/AutoBuild-Actions # Lisence: MIT # Author: P3TERX # Modify: Hyy2001X @@ -28,7 +28,6 @@ env: REPO_URL: https://github.com/coolsnowwolf/lede REPO_BRANCH: master CONFIG_FILE: .config - FEEDS_CONF_DEFAULT: feeds.conf.default CUSTOM_SCRIPT: ./Scripts/diy-script.sh TZ: Asia/Shanghai UPLOAD_RELEASE: true @@ -49,7 +48,8 @@ jobs: run: | sudo rm -rf /etc/apt/sources.list.d/* /usr/share/dotnet /usr/local/lib/android /opt/ghc sudo -E apt-get -qq update - sudo -E apt-get -qq install build-essential asciidoc binutils bzip2 gawk gettext git libncurses5-dev libz-dev patch python3 python2.7 unzip zlib1g-dev lib32gcc1 libc6-dev-i386 subversion flex uglifyjs git-core gcc-multilib p7zip p7zip-full msmtp libssl-dev texinfo libglib2.0-dev xmlto qemu-utils upx libelf-dev autoconf automake libtool autopoint device-tree-compiler g++-multilib antlr3 gperf wget curl swig rsync + sudo -E apt-get -qq install $(curl -fsSL git.io/depends-ubuntu-1804) + suco -E apt-get -qq clean sudo timedatectl set-timezone "$TZ" sudo mkdir -p /workdir sudo chown $USER:$GROUPS /workdir @@ -59,7 +59,7 @@ jobs: git clone -b $REPO_BRANCH $REPO_URL openwrt ln -sf /workdir/openwrt $GITHUB_WORKSPACE/openwrt - - name: Run Before-Update-Feeds Script + - name: Run Diy-Part1 Scripts run: | [ -e $FEEDS_CONF_DEFAULT ] && mv $FEEDS_CONF_DEFAULT openwrt/feeds.conf.default chmod +x $CUSTOM_SCRIPT @@ -72,29 +72,28 @@ jobs: ./scripts/feeds update -a ./scripts/feeds install -a - - name: Run After-Update-Feeds Script + - name: Run Diy-Part2 Scripts run: | [ -e $CONFIG_FILE ] && mv $CONFIG_FILE openwrt/.config cd openwrt - source $GITHUB_WORKSPACE/$CUSTOM_SCRIPT && Diy_Core && Diy-Part2 + source $GITHUB_WORKSPACE/$CUSTOM_SCRIPT && Diy-Part2 - - name: Download Package + - name: Download Packages run: | cd openwrt make defconfig - make download -j4 - find dl -size -1024c -exec ls -l {} \; + make download -j8 find dl -size -1024c -exec rm -f {} \; - - name: Compile the Firmware + - name: Compile the Openwrt run: | cd openwrt - make -j$(nproc) || make -j1 V=s + make -j$(nproc) || make -j1 || make -j1 V=s - - name: Run After-Compile-OpenWRT Script + - name: Run Diy-Part3 Scripts run: | cd openwrt - source $GITHUB_WORKSPACE/$CUSTOM_SCRIPT && Diy_Core && Diy-Part3 + source $GITHUB_WORKSPACE/$CUSTOM_SCRIPT && Diy-Part3 - name: Upload Firmware to Artifacts uses: actions/upload-artifact@main @@ -103,11 +102,11 @@ jobs: name: OpenWrt_Firmware path: openwrt/bin/Firmware - - name: Upload Firmware Directory to Artifacts + - name: Upload Firmware directory to Artifacts uses: actions/upload-artifact@main if: env.UPLOAD_BIN_DIR == 'true' && !cancelled() with: - name: OpenWrt_Bin + name: OpenWrt_bin path: openwrt/bin - name: Generate Tag @@ -118,7 +117,7 @@ jobs: echo "::set-env name=FIRMWARE::openwrt/bin/Firmware" echo "::set-output name=status::success" - - name: Upload Firmware to Github Release + - name: Upload Firmware to Releases uses: softprops/action-gh-release@v1 if: steps.tag.outputs.status == 'success' && !cancelled() env: @@ -128,7 +127,7 @@ jobs: body_path: update_log.txt files: ${{ env.FIRMWARE }}/* - - name: Remove Old Artifacts + - name: Remove old Artifacts uses: c-hive/gha-remove-artifacts@v1 with: age: '1 month'