diff --git a/.github/workflows/n1_roofts.yml b/.github/workflows/openwrt-builder.yml similarity index 70% rename from .github/workflows/n1_roofts.yml rename to .github/workflows/openwrt-builder.yml index 28429f9564..68b6c538a9 100644 --- a/.github/workflows/n1_roofts.yml +++ b/.github/workflows/openwrt-builder.yml @@ -1,23 +1,12 @@ # -# Copyright (c) 2019-2020 P3TERX -# -# This is free software, licensed under the MIT License. -# See /LICENSE for more information. -# -# https://github.com/P3TERX/Actions-OpenWrt # Description: Build OpenWrt using GitHub Actions # -name: Build OpenWrt N1_rootfs +name: Build OpenWrt on: repository_dispatch: workflow_dispatch: - inputs: - ssh: - description: 'SSH connection to Actions' - required: false - default: 'false' env: REPO_URL: https://github.com/coolsnowwolf/lede @@ -28,8 +17,6 @@ env: DIY_P2_SH: diy-part2.sh UPLOAD_BIN_DIR: false UPLOAD_FIRMWARE: true - UPLOAD_COWTRANSFER: false - UPLOAD_WETRANSFER: false UPLOAD_RELEASE: true SERVERCHAN_SCKEY: true USE_CACHEWRTBUILD: true @@ -60,7 +47,8 @@ jobs: env: DEBIAN_FRONTEND: noninteractive run: | - sudo rm -rf /etc/apt/sources.list.d/* /usr/share/dotnet /usr/local/lib/android /opt/ghc + sudo rm -rf /etc/apt/sources.list.d/* /usr/share/dotnet /usr/local/lib/android /opt/ghc /opt/hostedtoolcache/CodeQL + sudo docker image prune --all --force sudo -E apt-get -qq update sudo -E apt-get -qq install ack antlr3 asciidoc autoconf automake autopoint binutils bison build-essential bzip2 ccache cmake cpio curl device-tree-compiler fastjar flex gawk gettext gcc-multilib g++-multilib git gperf haveged help2man intltool libc6-dev-i386 libelf-dev libfuse-dev libglib2.0-dev libgmp3-dev libltdl-dev libmpc-dev libmpfr-dev libncurses5-dev libncursesw5-dev libpython3-dev libreadline-dev libssl-dev libtool lrzsz mkisofs msmtp ninja-build p7zip p7zip-full patch pkgconf python2.7 python3 python3-pyelftools python3-setuptools qemu-utils rsync scons squashfs-tools subversion swig texinfo uglifyjs upx-ucl unzip vim wget xmlto xxd zlib1g-dev sudo -E apt-get -qq autoremove --purge @@ -104,13 +92,6 @@ jobs: - name: Install feeds run: cd openwrt && ./scripts/feeds install -a - - name: SSH connection to Actions - uses: P3TERX/ssh2actions@v1.0.0 - if: (github.event.inputs.ssh == 'true' && github.event.inputs.ssh != 'false') || contains(github.event.action, 'ssh') - env: - TELEGRAM_CHAT_ID: ${{ secrets.TELEGRAM_CHAT_ID }} - TELEGRAM_BOT_TOKEN: ${{ secrets.TELEGRAM_BOT_TOKEN }} - - name: chmod run: | cd openwrt @@ -131,7 +112,7 @@ jobs: cd openwrt echo -e "$(nproc) thread compile" make -j$(nproc) || make -j1 || make -j1 V=s - echo "::set-output name=status::success" + echo "status=success" >> $GITHUB_OUTPUT grep '^CONFIG_TARGET.*DEVICE.*=y' .config | sed -r 's/.*DEVICE_(.*)=y/\1/' > DEVICE_NAME [ -s DEVICE_NAME ] && echo "DEVICE_NAME=_$(cat DEVICE_NAME)" >> $GITHUB_ENV echo "FILE_DATE=_$(date +"%Y%m%d%H%M")" >> $GITHUB_ENV @@ -154,7 +135,7 @@ jobs: cd openwrt/bin/targets/*/* rm -rf packages echo "FIRMWARE=$PWD" >> $GITHUB_ENV - echo "::set-output name=status::success" + echo "status=success" >> $GITHUB_OUTPUT - name: Upload firmware directory uses: actions/upload-artifact@main @@ -163,36 +144,17 @@ jobs: name: OpenWrt_firmware${{ env.DEVICE_NAME }}${{ env.FILE_DATE }} path: ${{ env.FIRMWARE }} - - name: Upload firmware to cowtransfer - id: cowtransfer - if: steps.organize.outputs.status == 'success' && env.UPLOAD_COWTRANSFER == 'true' && !cancelled() - run: | - curl -fsSL git.io/file-transfer | sh - ./transfer cow --block 2621440 -s -p 64 --no-progress ${FIRMWARE} 2>&1 | tee cowtransfer.log - echo "::warning file=cowtransfer.com::$(cat cowtransfer.log | grep https)" - echo "::set-output name=url::$(cat cowtransfer.log | grep https | cut -f3 -d" ")" - - - name: Upload firmware to WeTransfer - id: wetransfer - if: steps.organize.outputs.status == 'success' && env.UPLOAD_WETRANSFER == 'true' && !cancelled() - run: | - curl -fsSL git.io/file-transfer | sh - ./transfer wet -s -p 16 --no-progress ${FIRMWARE} 2>&1 | tee wetransfer.log - echo "::warning file=wetransfer.com::$(cat wetransfer.log | grep https)" - echo "::set-output name=url::$(cat wetransfer.log | grep https | cut -f3 -d" ")" - - name: Generate release tag id: tag if: env.UPLOAD_RELEASE == 'true' && !cancelled() run: | - echo "::set-output name=release_tag::$(date +"%Y.%m.%d-%H%M")" + echo "release_tag=$(date +"%Y.%m.%d-%H%M")" >> $GITHUB_OUTPUT touch release.txt - [ $UPLOAD_COWTRANSFER = true ] && echo "🔗 [Cowtransfer](${{ steps.cowtransfer.outputs.url }})" >> release.txt - [ $UPLOAD_WETRANSFER = true ] && echo "🔗 [WeTransfer](${{ steps.wetransfer.outputs.url }})" >> release.txt - echo "::set-output name=status::success" + [ ${UPLOAD_GOFILE} = true && ${{ steps.gofile.outputs.url }} ] && echo "🔗 [GoFile](${{ steps.gofile.outputs.url }})" >> release.txt + echo "status=success" >> $GITHUB_OUTPUT - name: Upload firmware to release - uses: softprops/action-gh-release@v1 + uses: softprops/action-gh-release@master if: steps.tag.outputs.status == 'success' && !cancelled() env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -202,13 +164,13 @@ jobs: files: ${{ env.FIRMWARE }}/* - name: Delete workflow runs - uses: GitRML/delete-workflow-runs@main + uses: Mattraks/delete-workflow-runs@main with: - retain_days: 1 - keep_minimum_runs: 3 + retain_days: 0 + keep_minimum_runs: 2 - name: Remove old Releases - uses: dev-drprasad/delete-older-releases@v0.1.0 + uses: dev-drprasad/delete-older-releases@master if: env.UPLOAD_RELEASE == 'true' && !cancelled() with: keep_latest: 3