From 77548e335b4d231924bee8e2773b67b5c72a1ba2 Mon Sep 17 00:00:00 2001 From: Summer <85640068+haiibo@users.noreply.github.com> Date: Sun, 28 Aug 2022 23:22:14 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=B9=B6=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E6=97=A0=E7=94=A8=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...ini-OpenWrt.yml => ARMv8-Mini-OpenWrt.yml} | 36 ++++++++------- .github/workflows/ARMv8-Package.yml | 45 +++++++++++++------ ...lus-OpenWrt.yml => ARMv8-Plus-OpenWrt.yml} | 34 +++++++------- .github/workflows/Delete-Older-Artifacts.yml | 4 +- .github/workflows/RaspberryPi3-OpenWrt.yml | 18 +++----- .github/workflows/RaspberryPi4-OpenWrt.yml | 18 +++----- .github/workflows/Rockchip-OpenWrt.yml | 18 +++----- .github/workflows/X86_64-OpenWrt.yml | 18 +++----- README.md | 6 +-- .../{armv8_mini.config => armv8-mini.config} | 0 .../{armv8_plus.config => armv8-plus.config} | 0 11 files changed, 101 insertions(+), 96 deletions(-) rename .github/workflows/{ARMv8_Mini-OpenWrt.yml => ARMv8-Mini-OpenWrt.yml} (87%) rename .github/workflows/{ARMv8_Plus-OpenWrt.yml => ARMv8-Plus-OpenWrt.yml} (87%) rename configs/{armv8_mini.config => armv8-mini.config} (100%) rename configs/{armv8_plus.config => armv8-plus.config} (100%) diff --git a/.github/workflows/ARMv8_Mini-OpenWrt.yml b/.github/workflows/ARMv8-Mini-OpenWrt.yml similarity index 87% rename from .github/workflows/ARMv8_Mini-OpenWrt.yml rename to .github/workflows/ARMv8-Mini-OpenWrt.yml index aad65aade0..8a956b66fe 100644 --- a/.github/workflows/ARMv8_Mini-OpenWrt.yml +++ b/.github/workflows/ARMv8-Mini-OpenWrt.yml @@ -6,18 +6,17 @@ # https://github.com/P3TERX #=============================================== -name: ARMv8_Mini OpenWrt +name: ARMv8 Mini OpenWrt on: - repository_dispatch: workflow_dispatch: schedule: - - cron: '0 0 * * *' + - cron: '0 23 * * *' env: REPO_URL: https://github.com/coolsnowwolf/lede REPO_BRANCH: master - CONFIG_FILE: configs/armv8_mini.config + CONFIG_FILE: configs/armv8-mini.config DIY_SCRIPT: diy-mini.sh UPLOAD_BIN_DIR: false UPLOAD_FIRMWARE: false @@ -39,16 +38,14 @@ jobs: DEBIAN_FRONTEND: noninteractive run: | docker rmi $(docker images -q) - sudo rm -rf /etc/apt/sources.list.d/* /usr/share/dotnet /etc/mysql /etc/php /usr/local/lib/android /opt/ghc - sudo -E apt-get -y purge azure-cli ghc* zulu* hhvm llvm* firefox google* dotnet* powershell openjdk* adoptopenjdk* mysql* php* mongodb* dotnet* moby* snapd* || true + 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 $(curl -fsSL https://is.gd/depends_ubuntu_2204) + sudo -E apt-get -qq install $(curl -fsSL is.gd/depends_ubuntu_2204) sudo -E apt-get -qq autoremove --purge sudo -E apt-get -qq clean sudo timedatectl set-timezone "$TZ" sudo mkdir -p /workdir sudo chown $USER:$GROUPS /workdir - df -Th - name: Clone source code working-directory: /workdir @@ -96,8 +93,7 @@ jobs: echo "FILE_DATE=_$(date +"%Y%m%d%H%M")" >> $GITHUB_ENV - name: Check space usage - if: (!cancelled()) - run: df -Th + run: df -hT - name: Upload bin directory uses: actions/upload-artifact@main @@ -108,7 +104,7 @@ jobs: - name: Organize files id: organize - if: steps.compile.outputs.status == 'success' && !cancelled() + if: steps.compile.outputs.status == 'success' run: | cp openwrt/.config build.config mkdir -p Packages @@ -124,14 +120,14 @@ jobs: - name: Upload firmware directory uses: actions/upload-artifact@main - if: steps.organize.outputs.status == 'success' && env.UPLOAD_FIRMWARE == 'true' && !cancelled() + if: steps.organize.outputs.status == 'success' && env.UPLOAD_FIRMWARE == 'true' with: name: OpenWrt_firmware${{ env.DEVICE_NAME }}${{ env.FILE_DATE }} path: ${{ env.FIRMWARE }} - name: Upload firmware to release - uses: ncipollo/release-action@v1 - if: steps.organize.outputs.status == 'success' && env.UPLOAD_RELEASE == 'true' && !cancelled() + uses: ncipollo/release-action@main + if: steps.organize.outputs.status == 'success' && env.UPLOAD_RELEASE == 'true' with: name: R${{ env.DATE }} for ${{ env.FILE_NAME }} artifacts: ${{ env.FIRMWARE }}/* @@ -147,7 +143,7 @@ jobs: - name: Package armvirt as openwrt uses: unifreq/openwrt_packit@master - if: steps.organize.outputs.status == 'success' && !cancelled() + if: steps.organize.outputs.status == 'success' env: OPENWRT_ARMVIRT: lean/*/*/*rootfs.tar.gz PACKAGE_SOC: all @@ -156,9 +152,15 @@ jobs: KERNEL_AUTO_LATEST: true GZIP_IMGS: .gz + - name: Upload openwrt to actions + uses: kittaakos/upload-artifact-as-is@master + if: env.PACKAGED_STATUS == 'success' && env.UPLOAD_FIRMWARE == 'true' + with: + path: ${{ env.PACKAGED_OUTPUTPATH }} + - name: Upload openwrt to release - uses: ncipollo/release-action@v1 - if: env.PACKAGED_STATUS == 'success' && !cancelled() + uses: ncipollo/release-action@main + if: env.PACKAGED_STATUS == 'success' && env.UPLOAD_RELEASE == 'true' with: name: R${{ env.DATE }} for ${{ env.PRODUCT_NAME }} artifacts: ${{ env.PACKAGED_OUTPUTPATH }}/* diff --git a/.github/workflows/ARMv8-Package.yml b/.github/workflows/ARMv8-Package.yml index 95b5e97a70..ba9d5ab2e2 100644 --- a/.github/workflows/ARMv8-Package.yml +++ b/.github/workflows/ARMv8-Package.yml @@ -9,7 +9,6 @@ name: ARMv8 Package on: - repository_dispatch: workflow_dispatch: schedule: - cron: '0 15 * * *' @@ -42,7 +41,7 @@ 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 $(curl -fsSL https://is.gd/depends_ubuntu_2204) + sudo -E apt-get -qq install $(curl -fsSL is.gd/depends_ubuntu_2204) sudo -E apt-get -qq autoremove --purge sudo -E apt-get -qq clean sudo timedatectl set-timezone "$TZ" @@ -60,25 +59,34 @@ jobs: echo "useVersionInfo=$useVersionInfo" >> $GITHUB_ENV echo "DATE=$(date +"%Y-%m-%d %H:%M:%S")" >> $GITHUB_ENV + - name: Download armvirt firmware + id: download + run: | + mkdir -p openwrt/bin/targets/armvirt/64 + cd openwrt/bin/targets/armvirt/64 + wget -q https://github.com/${GITHUB_REPOSITORY}/releases/download/ROOTFS_${{ env.VERSION }}/openwrt-armvirt-64-default-rootfs.tar.gz + echo "::set-output name=status::success" + - name: Package armvirt as openwrt uses: ophub/flippy-openwrt-actions@main + if: steps.download.outputs.status == 'success' env: - OPENWRT_ARMVIRT: https://github.com/haiibo/OpenWrt/releases/download/ROOTFS_${{ env.VERSION }}/openwrt-armvirt-64-default-rootfs.tar.gz + OPENWRT_ARMVIRT: openwrt/bin/targets/*/*/*rootfs.tar.gz PACKAGE_SOC: all KERNEL_REPO_URL: https://github.com/ophub/kernel/tree/main/pub/stable KERNEL_VERSION_NAME: 5.15.13_5.19.1 KERNEL_AUTO_LATEST: true GZIP_IMGS: .gz - - name: Upload artifact to actions + - name: Upload openwrt to actions uses: kittaakos/upload-artifact-as-is@master - if: env.PACKAGED_STATUS == 'success' && env.UPLOAD_FIRMWARE == 'true' && !cancelled() + if: env.PACKAGED_STATUS == 'success' && env.UPLOAD_FIRMWARE == 'true' with: path: ${{ env.PACKAGED_OUTPUTPATH }} - name: Upload openwrt to release - uses: ncipollo/release-action@v1 - if: env.PACKAGED_STATUS == 'success' && env.UPLOAD_RELEASE == 'true' && !cancelled() + uses: ncipollo/release-action@main + if: env.PACKAGED_STATUS == 'success' && env.UPLOAD_RELEASE == 'true' with: name: R${{ env.DATE }} for ARMv8_${{ env.VERSION }} artifacts: ${{ env.PACKAGED_OUTPUTPATH }}/* @@ -96,7 +104,7 @@ jobs: ${{ env.useVersionInfo }} Package-for-Plus: - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 if: github.event.repository.owner.id == github.event.sender.id env: @@ -113,7 +121,7 @@ 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 $(curl -fsSL git.io/depends-ubuntu-2004) + sudo -E apt-get -qq install $(curl -fsSL is.gd/depends_ubuntu_2204) sudo -E apt-get -qq autoremove --purge sudo -E apt-get -qq clean sudo timedatectl set-timezone "$TZ" @@ -131,25 +139,34 @@ jobs: echo "useVersionInfo=$useVersionInfo" >> $GITHUB_ENV echo "DATE=$(date +"%Y-%m-%d %H:%M:%S")" >> $GITHUB_ENV + - name: Download armvirt firmware + id: download + run: | + mkdir -p openwrt/bin/targets/armvirt/64 + cd openwrt/bin/targets/armvirt/64 + wget -q https://github.com/${GITHUB_REPOSITORY}/releases/download/ROOTFS_${{ env.VERSION }}/openwrt-armvirt-64-default-rootfs.tar.gz + echo "::set-output name=status::success" + - name: Package armvirt as openwrt uses: ophub/flippy-openwrt-actions@main + if: steps.download.outputs.status == 'success' env: - OPENWRT_ARMVIRT: https://github.com/haiibo/OpenWrt/releases/download/ROOTFS_${{ env.VERSION }}/openwrt-armvirt-64-default-rootfs.tar.gz + OPENWRT_ARMVIRT: openwrt/bin/targets/*/*/*rootfs.tar.gz PACKAGE_SOC: all KERNEL_REPO_URL: https://github.com/ophub/kernel/tree/main/pub/stable KERNEL_VERSION_NAME: 5.15.13_5.19.1 KERNEL_AUTO_LATEST: true GZIP_IMGS: .gz - - name: Upload artifact to actions + - name: Upload openwrt to actions uses: kittaakos/upload-artifact-as-is@master - if: env.PACKAGED_STATUS == 'success' && env.UPLOAD_FIRMWARE == 'true' && !cancelled() + if: env.PACKAGED_STATUS == 'success' && env.UPLOAD_FIRMWARE == 'true' with: path: ${{ env.PACKAGED_OUTPUTPATH }} - name: Upload openwrt to release - uses: ncipollo/release-action@v1 - if: env.PACKAGED_STATUS == 'success' && env.UPLOAD_RELEASE == 'true' && !cancelled() + uses: ncipollo/release-action@main + if: env.PACKAGED_STATUS == 'success' && env.UPLOAD_RELEASE == 'true' with: name: R${{ env.DATE }} for ARMv8_${{ env.VERSION }} artifacts: ${{ env.PACKAGED_OUTPUTPATH }}/* diff --git a/.github/workflows/ARMv8_Plus-OpenWrt.yml b/.github/workflows/ARMv8-Plus-OpenWrt.yml similarity index 87% rename from .github/workflows/ARMv8_Plus-OpenWrt.yml rename to .github/workflows/ARMv8-Plus-OpenWrt.yml index 9d9b7e47f4..f55a57b4f2 100644 --- a/.github/workflows/ARMv8_Plus-OpenWrt.yml +++ b/.github/workflows/ARMv8-Plus-OpenWrt.yml @@ -6,10 +6,9 @@ # https://github.com/P3TERX #=============================================== -name: ARMv8_Plus OpenWrt +name: ARMv8 Plus OpenWrt on: - repository_dispatch: workflow_dispatch: schedule: - cron: '0 21 * * *' @@ -17,7 +16,7 @@ on: env: REPO_URL: https://github.com/coolsnowwolf/lede REPO_BRANCH: master - CONFIG_FILE: configs/armv8_plus.config + CONFIG_FILE: configs/armv8-plus.config DIY_SCRIPT: diy-script.sh UPLOAD_BIN_DIR: false UPLOAD_FIRMWARE: false @@ -39,16 +38,14 @@ jobs: DEBIAN_FRONTEND: noninteractive run: | docker rmi $(docker images -q) - sudo rm -rf /etc/apt/sources.list.d/* /usr/share/dotnet /etc/mysql /etc/php /usr/local/lib/android /opt/ghc - sudo -E apt-get -y purge azure-cli ghc* zulu* hhvm llvm* firefox google* dotnet* powershell openjdk* adoptopenjdk* mysql* php* mongodb* dotnet* moby* snapd* || true + 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 $(curl -fsSL https://is.gd/depends_ubuntu_2204) + sudo -E apt-get -qq install $(curl -fsSL is.gd/depends_ubuntu_2204) sudo -E apt-get -qq autoremove --purge sudo -E apt-get -qq clean sudo timedatectl set-timezone "$TZ" sudo mkdir -p /workdir sudo chown $USER:$GROUPS /workdir - df -Th - name: Clone source code working-directory: /workdir @@ -96,8 +93,7 @@ jobs: echo "FILE_DATE=_$(date +"%Y%m%d%H%M")" >> $GITHUB_ENV - name: Check space usage - if: (!cancelled()) - run: df -Th + run: df -hT - name: Upload bin directory uses: actions/upload-artifact@main @@ -108,7 +104,7 @@ jobs: - name: Organize files id: organize - if: steps.compile.outputs.status == 'success' && !cancelled() + if: steps.compile.outputs.status == 'success' run: | cp openwrt/.config build.config mkdir -p Packages @@ -124,14 +120,14 @@ jobs: - name: Upload firmware directory uses: actions/upload-artifact@main - if: steps.organize.outputs.status == 'success' && env.UPLOAD_FIRMWARE == 'true' && !cancelled() + if: steps.organize.outputs.status == 'success' && env.UPLOAD_FIRMWARE == 'true' with: name: OpenWrt_firmware${{ env.DEVICE_NAME }}${{ env.FILE_DATE }} path: ${{ env.FIRMWARE }} - name: Upload firmware to release - uses: ncipollo/release-action@v1 - if: steps.organize.outputs.status == 'success' && env.UPLOAD_RELEASE == 'true' && !cancelled() + uses: ncipollo/release-action@main + if: steps.organize.outputs.status == 'success' && env.UPLOAD_RELEASE == 'true' with: name: R${{ env.DATE }} for ${{ env.FILE_NAME }} artifacts: ${{ env.FIRMWARE }}/* @@ -147,7 +143,7 @@ jobs: - name: Package armvirt as openwrt uses: unifreq/openwrt_packit@master - if: steps.organize.outputs.status == 'success' && !cancelled() + if: steps.organize.outputs.status == 'success' env: OPENWRT_ARMVIRT: lean/*/*/*rootfs.tar.gz PACKAGE_SOC: all @@ -156,9 +152,15 @@ jobs: KERNEL_AUTO_LATEST: true GZIP_IMGS: .gz + - name: Upload openwrt to actions + uses: kittaakos/upload-artifact-as-is@master + if: env.PACKAGED_STATUS == 'success' && env.UPLOAD_FIRMWARE == 'true' + with: + path: ${{ env.PACKAGED_OUTPUTPATH }} + - name: Upload openwrt to release - uses: ncipollo/release-action@v1 - if: env.PACKAGED_STATUS == 'success' && !cancelled() + uses: ncipollo/release-action@main + if: env.PACKAGED_STATUS == 'success' && env.UPLOAD_RELEASE == 'true' with: name: R${{ env.DATE }} for ${{ env.PRODUCT_NAME }} artifacts: ${{ env.PACKAGED_OUTPUTPATH }}/* diff --git a/.github/workflows/Delete-Older-Artifacts.yml b/.github/workflows/Delete-Older-Artifacts.yml index b339b07f85..ec38628a90 100644 --- a/.github/workflows/Delete-Older-Artifacts.yml +++ b/.github/workflows/Delete-Older-Artifacts.yml @@ -3,7 +3,7 @@ name: Delete Older Artifacts on: workflow_dispatch: schedule: - - cron: '0 2 * * *' + - cron: '0 3 * * *' jobs: Cleaning: @@ -14,7 +14,7 @@ jobs: uses: GitRML/delete-workflow-runs@main with: token: ${{ secrets.GITHUB_TOKEN }} - retain_days: 3 + retain_days: 7 keep_minimum_runs: 0 - name: Delete Older Releases diff --git a/.github/workflows/RaspberryPi3-OpenWrt.yml b/.github/workflows/RaspberryPi3-OpenWrt.yml index 9269a5aa98..a297300fe7 100644 --- a/.github/workflows/RaspberryPi3-OpenWrt.yml +++ b/.github/workflows/RaspberryPi3-OpenWrt.yml @@ -9,7 +9,6 @@ name: RaspberryPi3 OpenWrt on: - repository_dispatch: workflow_dispatch: schedule: - cron: '10 15 * * *' @@ -39,16 +38,14 @@ jobs: DEBIAN_FRONTEND: noninteractive run: | docker rmi $(docker images -q) - sudo rm -rf /etc/apt/sources.list.d/* /usr/share/dotnet /etc/mysql /etc/php /usr/local/lib/android /opt/ghc - sudo -E apt-get -y purge azure-cli ghc* zulu* hhvm llvm* firefox google* dotnet* powershell openjdk* adoptopenjdk* mysql* php* mongodb* dotnet* moby* snapd* || true + 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 $(curl -fsSL https://is.gd/depends_ubuntu_2204) + sudo -E apt-get -qq install $(curl -fsSL is.gd/depends_ubuntu_2204) sudo -E apt-get -qq autoremove --purge sudo -E apt-get -qq clean sudo timedatectl set-timezone "$TZ" sudo mkdir -p /workdir sudo chown $USER:$GROUPS /workdir - df -Th - name: Clone source code working-directory: /workdir @@ -97,8 +94,7 @@ jobs: echo "FILE_DATE=_$(date +"%Y%m%d%H%M")" >> $GITHUB_ENV - name: Check space usage - if: (!cancelled()) - run: df -Th + run: df -hT - name: Upload bin directory uses: actions/upload-artifact@main @@ -109,7 +105,7 @@ jobs: - name: Organize files id: organize - if: steps.compile.outputs.status == 'success' && !cancelled() + if: steps.compile.outputs.status == 'success' run: | cp openwrt/.config build.config mkdir -p Packages @@ -124,14 +120,14 @@ jobs: - name: Upload firmware directory uses: actions/upload-artifact@main - if: steps.organize.outputs.status == 'success' && env.UPLOAD_FIRMWARE == 'true' && !cancelled() + if: steps.organize.outputs.status == 'success' && env.UPLOAD_FIRMWARE == 'true' with: name: OpenWrt_firmware${{ env.DEVICE_NAME }}${{ env.FILE_DATE }} path: ${{ env.FIRMWARE }} - name: Upload firmware to release - uses: ncipollo/release-action@v1 - if: steps.organize.outputs.status == 'success' && env.UPLOAD_RELEASE == 'true' && !cancelled() + uses: ncipollo/release-action@main + if: steps.organize.outputs.status == 'success' && env.UPLOAD_RELEASE == 'true' with: name: R${{ env.DATE }} for ${{ env.FILE_NAME }} artifacts: ${{ env.FIRMWARE }}/* diff --git a/.github/workflows/RaspberryPi4-OpenWrt.yml b/.github/workflows/RaspberryPi4-OpenWrt.yml index ed37736b00..632b2999b8 100644 --- a/.github/workflows/RaspberryPi4-OpenWrt.yml +++ b/.github/workflows/RaspberryPi4-OpenWrt.yml @@ -9,7 +9,6 @@ name: RaspberryPi4 OpenWrt on: - repository_dispatch: workflow_dispatch: schedule: - cron: '0 16 * * *' @@ -39,16 +38,14 @@ jobs: DEBIAN_FRONTEND: noninteractive run: | docker rmi $(docker images -q) - sudo rm -rf /etc/apt/sources.list.d/* /usr/share/dotnet /etc/mysql /etc/php /usr/local/lib/android /opt/ghc - sudo -E apt-get -y purge azure-cli ghc* zulu* hhvm llvm* firefox google* dotnet* powershell openjdk* adoptopenjdk* mysql* php* mongodb* dotnet* moby* snapd* || true + 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 $(curl -fsSL https://is.gd/depends_ubuntu_2204) + sudo -E apt-get -qq install $(curl -fsSL is.gd/depends_ubuntu_2204) sudo -E apt-get -qq autoremove --purge sudo -E apt-get -qq clean sudo timedatectl set-timezone "$TZ" sudo mkdir -p /workdir sudo chown $USER:$GROUPS /workdir - df -Th - name: Clone source code working-directory: /workdir @@ -97,8 +94,7 @@ jobs: echo "FILE_DATE=_$(date +"%Y%m%d%H%M")" >> $GITHUB_ENV - name: Check space usage - if: (!cancelled()) - run: df -Th + run: df -hT - name: Upload bin directory uses: actions/upload-artifact@main @@ -109,7 +105,7 @@ jobs: - name: Organize files id: organize - if: steps.compile.outputs.status == 'success' && !cancelled() + if: steps.compile.outputs.status == 'success' run: | cp openwrt/.config build.config mkdir -p Packages @@ -124,14 +120,14 @@ jobs: - name: Upload firmware directory uses: actions/upload-artifact@main - if: steps.organize.outputs.status == 'success' && env.UPLOAD_FIRMWARE == 'true' && !cancelled() + if: steps.organize.outputs.status == 'success' && env.UPLOAD_FIRMWARE == 'true' with: name: OpenWrt_firmware${{ env.DEVICE_NAME }}${{ env.FILE_DATE }} path: ${{ env.FIRMWARE }} - name: Upload firmware to release - uses: ncipollo/release-action@v1 - if: steps.organize.outputs.status == 'success' && env.UPLOAD_RELEASE == 'true' && !cancelled() + uses: ncipollo/release-action@main + if: steps.organize.outputs.status == 'success' && env.UPLOAD_RELEASE == 'true' with: name: R${{ env.DATE }} for ${{ env.FILE_NAME }} artifacts: ${{ env.FIRMWARE }}/* diff --git a/.github/workflows/Rockchip-OpenWrt.yml b/.github/workflows/Rockchip-OpenWrt.yml index 05b092ce42..d8161eda29 100644 --- a/.github/workflows/Rockchip-OpenWrt.yml +++ b/.github/workflows/Rockchip-OpenWrt.yml @@ -9,7 +9,6 @@ name: Rockchip OpenWrt on: - repository_dispatch: workflow_dispatch: schedule: - cron: '0 17 * * *' @@ -39,16 +38,14 @@ jobs: DEBIAN_FRONTEND: noninteractive run: | docker rmi $(docker images -q) - sudo rm -rf /etc/apt/sources.list.d/* /usr/share/dotnet /etc/mysql /etc/php /usr/local/lib/android /opt/ghc - sudo -E apt-get -y purge azure-cli ghc* zulu* hhvm llvm* firefox google* dotnet* powershell openjdk* adoptopenjdk* mysql* php* mongodb* dotnet* moby* snapd* || true + 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 $(curl -fsSL https://is.gd/depends_ubuntu_2204) + sudo -E apt-get -qq install $(curl -fsSL is.gd/depends_ubuntu_2204) sudo -E apt-get -qq autoremove --purge sudo -E apt-get -qq clean sudo timedatectl set-timezone "$TZ" sudo mkdir -p /workdir sudo chown $USER:$GROUPS /workdir - df -Th - name: Clone source code working-directory: /workdir @@ -96,8 +93,7 @@ jobs: echo "FILE_DATE=_$(date +"%Y%m%d%H%M")" >> $GITHUB_ENV - name: Check space usage - if: (!cancelled()) - run: df -Th + run: df -hT - name: Upload bin directory uses: actions/upload-artifact@main @@ -108,7 +104,7 @@ jobs: - name: Organize files id: organize - if: steps.compile.outputs.status == 'success' && !cancelled() + if: steps.compile.outputs.status == 'success' run: | cp openwrt/.config build.config mkdir -p Packages @@ -123,14 +119,14 @@ jobs: - name: Upload firmware directory uses: actions/upload-artifact@main - if: steps.organize.outputs.status == 'success' && env.UPLOAD_FIRMWARE == 'true' && !cancelled() + if: steps.organize.outputs.status == 'success' && env.UPLOAD_FIRMWARE == 'true' with: name: OpenWrt_firmware${{ env.DEVICE_NAME }}${{ env.FILE_DATE }} path: ${{ env.FIRMWARE }} - name: Upload firmware to release - uses: ncipollo/release-action@v1 - if: steps.organize.outputs.status == 'success' && env.UPLOAD_RELEASE == 'true' && !cancelled() + uses: ncipollo/release-action@main + if: steps.organize.outputs.status == 'success' && env.UPLOAD_RELEASE == 'true' with: name: R${{ env.DATE }} for ${{ env.FILE_NAME }} artifacts: ${{ env.FIRMWARE }}/* diff --git a/.github/workflows/X86_64-OpenWrt.yml b/.github/workflows/X86_64-OpenWrt.yml index 46150dca1e..f5e1252da5 100644 --- a/.github/workflows/X86_64-OpenWrt.yml +++ b/.github/workflows/X86_64-OpenWrt.yml @@ -9,7 +9,6 @@ name: X86_64 OpenWrt on: - repository_dispatch: workflow_dispatch: schedule: - cron: '0 19 * * *' @@ -38,16 +37,14 @@ jobs: DEBIAN_FRONTEND: noninteractive run: | docker rmi $(docker images -q) - sudo rm -rf /etc/apt/sources.list.d/* /usr/share/dotnet /etc/mysql /etc/php /usr/local/lib/android /opt/ghc - sudo -E apt-get -y purge azure-cli ghc* zulu* hhvm llvm* firefox google* dotnet* powershell openjdk* adoptopenjdk* mysql* php* mongodb* dotnet* moby* snapd* || true + 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 $(curl -fsSL https://is.gd/depends_ubuntu_2204) + sudo -E apt-get -qq install $(curl -fsSL is.gd/depends_ubuntu_2204) sudo -E apt-get -qq autoremove --purge sudo -E apt-get -qq clean sudo timedatectl set-timezone "$TZ" sudo mkdir -p /workdir sudo chown $USER:$GROUPS /workdir - df -Th - name: Clone source code working-directory: /workdir @@ -95,8 +92,7 @@ jobs: echo "FILE_DATE=_$(date +"%Y%m%d%H%M")" >> $GITHUB_ENV - name: Check space usage - if: (!cancelled()) - run: df -Th + run: df -hT - name: Upload bin directory uses: actions/upload-artifact@main @@ -107,7 +103,7 @@ jobs: - name: Organize files id: organize - if: steps.compile.outputs.status == 'success' && !cancelled() + if: steps.compile.outputs.status == 'success' run: | cp openwrt/.config build.config mkdir -p Packages @@ -122,14 +118,14 @@ jobs: - name: Upload firmware directory uses: actions/upload-artifact@main - if: steps.organize.outputs.status == 'success' && env.UPLOAD_FIRMWARE == 'true' && !cancelled() + if: steps.organize.outputs.status == 'success' && env.UPLOAD_FIRMWARE == 'true' with: name: OpenWrt_firmware${{ env.DEVICE_NAME }}${{ env.FILE_DATE }} path: ${{ env.FIRMWARE }} - name: Upload firmware to release - uses: ncipollo/release-action@v1 - if: steps.organize.outputs.status == 'success' && env.UPLOAD_RELEASE == 'true' && !cancelled() + uses: ncipollo/release-action@main + if: steps.organize.outputs.status == 'success' && env.UPLOAD_RELEASE == 'true' with: name: R${{ env.DATE }} for ${{ env.FILE_NAME }} artifacts: ${{ env.FIRMWARE }}/* diff --git a/README.md b/README.md index d21bfda73e..0b5b634a5d 100644 --- a/README.md +++ b/README.md @@ -30,8 +30,8 @@ | 平台+设备名称 | 固件编译状态 | 配置文件 | 固件下载 | | :-------------: | :-------------: | :-------------: | :-------------: | | [![](https://img.shields.io/badge/OpenWrt-X86_64位-32C955.svg?logo=openwrt)](https://github.com/haiibo/OpenWrt/blob/main/.github/workflows/X86_64-OpenWrt.yml) | [![](https://github.com/haiibo/OpenWrt/actions/workflows/X86_64-OpenWrt.yml/badge.svg)](https://github.com/haiibo/OpenWrt/actions/workflows/X86_64-OpenWrt.yml) | [![](https://img.shields.io/badge/编译-配置-orange.svg?logo=apache-spark)](https://github.com/haiibo/OpenWrt/blob/main/configs/x86_64.config) | [![](https://img.shields.io/badge/下载-链接-blueviolet.svg?logo=hack-the-box)](https://github.com/haiibo/OpenWrt/releases/tag/X86_64) | -| [![](https://img.shields.io/badge/OpenWrt-ARMv8_Mini-32C955.svg?logo=openwrt)](https://github.com/haiibo/OpenWrt/blob/main/.github/workflows/ARMv8_Mini-OpenWrt.yml) | [![](https://github.com/haiibo/OpenWrt/actions/workflows/ARMv8_Mini-OpenWrt.yml/badge.svg)](https://github.com/haiibo/OpenWrt/actions/workflows/ARMv8_Mini-OpenWrt.yml) | [![](https://img.shields.io/badge/编译-配置-orange.svg?logo=apache-spark)](https://github.com/haiibo/OpenWrt/blob/main/configs/armv8_mini.config) | [![](https://img.shields.io/badge/下载-链接-blueviolet.svg?logo=hack-the-box)](https://github.com/haiibo/OpenWrt/releases/tag/ARMv8_MINI) | -| [![](https://img.shields.io/badge/OpenWrt-ARMv8_Plus-32C955.svg?logo=openwrt)](https://github.com/haiibo/OpenWrt/blob/main/.github/workflows/ARMv8_Plus-OpenWrt.yml) | [![](https://github.com/haiibo/OpenWrt/actions/workflows/ARMv8_Plus-OpenWrt.yml/badge.svg)](https://github.com/haiibo/OpenWrt/actions/workflows/ARMv8_Plus-OpenWrt.yml) | [![](https://img.shields.io/badge/编译-配置-orange.svg?logo=apache-spark)](https://github.com/haiibo/OpenWrt/blob/main/configs/armv8_plus.config) | [![](https://img.shields.io/badge/下载-链接-blueviolet.svg?logo=hack-the-box)](https://github.com/haiibo/OpenWrt/releases/tag/ARMv8_PLUS) | +| [![](https://img.shields.io/badge/OpenWrt-ARMv8_Mini-32C955.svg?logo=openwrt)](https://github.com/haiibo/OpenWrt/blob/main/.github/workflows/ARMv8-Mini-OpenWrt.yml) | [![](https://github.com/haiibo/OpenWrt/actions/workflows/ARMv8-Mini-OpenWrt.yml/badge.svg)](https://github.com/haiibo/OpenWrt/actions/workflows/ARMv8-Mini-OpenWrt.yml) | [![](https://img.shields.io/badge/编译-配置-orange.svg?logo=apache-spark)](https://github.com/haiibo/OpenWrt/blob/main/configs/armv8-mini.config) | [![](https://img.shields.io/badge/下载-链接-blueviolet.svg?logo=hack-the-box)](https://github.com/haiibo/OpenWrt/releases/tag/ARMv8_MINI) | +| [![](https://img.shields.io/badge/OpenWrt-ARMv8_Plus-32C955.svg?logo=openwrt)](https://github.com/haiibo/OpenWrt/blob/main/.github/workflows/ARMv8-Plus-OpenWrt.yml) | [![](https://github.com/haiibo/OpenWrt/actions/workflows/ARMv8-Plus-OpenWrt.yml/badge.svg)](https://github.com/haiibo/OpenWrt/actions/workflows/ARMv8-Plus-OpenWrt.yml) | [![](https://img.shields.io/badge/编译-配置-orange.svg?logo=apache-spark)](https://github.com/haiibo/OpenWrt/blob/main/configs/armv8-plus.config) | [![](https://img.shields.io/badge/下载-链接-blueviolet.svg?logo=hack-the-box)](https://github.com/haiibo/OpenWrt/releases/tag/ARMv8_PLUS) | | [![](https://img.shields.io/badge/OpenWrt-NanoPi_R2C-32C955.svg?logo=openwrt)](https://github.com/haiibo/OpenWrt/blob/main/.github/workflows/Rockchip-OpenWrt.yml) | [![](https://github.com/haiibo/OpenWrt/actions/workflows/Rockchip-OpenWrt.yml/badge.svg)](https://github.com/haiibo/OpenWrt/actions/workflows/Rockchip-OpenWrt.yml) | [![](https://img.shields.io/badge/编译-配置-orange.svg?logo=apache-spark)](https://github.com/haiibo/OpenWrt/blob/main/configs/rockchip.config) | [![](https://img.shields.io/badge/下载-链接-blueviolet.svg?logo=hack-the-box)](https://github.com/haiibo/OpenWrt/releases/tag/Rockchip) | | [![](https://img.shields.io/badge/OpenWrt-NanoPi_R2S-32C955.svg?logo=openwrt)](https://github.com/haiibo/OpenWrt/blob/main/.github/workflows/Rockchip-OpenWrt.yml) | [![](https://github.com/haiibo/OpenWrt/actions/workflows/Rockchip-OpenWrt.yml/badge.svg)](https://github.com/haiibo/OpenWrt/actions/workflows/Rockchip-OpenWrt.yml) | [![](https://img.shields.io/badge/编译-配置-orange.svg?logo=apache-spark)](https://github.com/haiibo/OpenWrt/blob/main/configs/rockchip.config) | [![](https://img.shields.io/badge/下载-链接-blueviolet.svg?logo=hack-the-box)](https://github.com/haiibo/OpenWrt/releases/tag/Rockchip) | | [![](https://img.shields.io/badge/OpenWrt-NanoPi_R4S-32C955.svg?logo=openwrt)](https://github.com/haiibo/OpenWrt/blob/main/.github/workflows/Rockchip-OpenWrt.yml) | [![](https://github.com/haiibo/OpenWrt/actions/workflows/Rockchip-OpenWrt.yml/badge.svg)](https://github.com/haiibo/OpenWrt/actions/workflows/Rockchip-OpenWrt.yml) | [![](https://img.shields.io/badge/编译-配置-orange.svg?logo=apache-spark)](https://github.com/haiibo/OpenWrt/blob/main/configs/rockchip.config) | [![](https://img.shields.io/badge/下载-链接-blueviolet.svg?logo=hack-the-box)](https://github.com/haiibo/OpenWrt/releases/tag/Rockchip) | @@ -262,7 +262,7 @@ ### 捐助方式 | | | | :-------------: | :-------------: | -| | | +| | | ## 鸣谢 [![](https://img.shields.io/badge/-跪谢各大佬-FFFFFF.svg)](#鸣谢-) diff --git a/configs/armv8_mini.config b/configs/armv8-mini.config similarity index 100% rename from configs/armv8_mini.config rename to configs/armv8-mini.config diff --git a/configs/armv8_plus.config b/configs/armv8-plus.config similarity index 100% rename from configs/armv8_plus.config rename to configs/armv8-plus.config