From 3eebe02bd3b471ad9c4d09e155b0a4de0621b26d Mon Sep 17 00:00:00 2001 From: Daniel Pawlik Date: Wed, 11 Sep 2024 14:00:58 +0200 Subject: [PATCH] Small github workflows improvement --- .github/workflows/bpi-r4-BE14-janusz.yaml | 23 +++++++++++++++-------- .github/workflows/bpi-r4-BE14.yaml | 12 ++++++++---- .github/workflows/bpi-r4.yaml | 17 ++++++++++++++--- 3 files changed, 37 insertions(+), 15 deletions(-) diff --git a/.github/workflows/bpi-r4-BE14-janusz.yaml b/.github/workflows/bpi-r4-BE14-janusz.yaml index e74dbbe..85e627c 100644 --- a/.github/workflows/bpi-r4-BE14-janusz.yaml +++ b/.github/workflows/bpi-r4-BE14-janusz.yaml @@ -1,15 +1,16 @@ --- -# hostapd: https://github.com/openwrt/openwrt/pull/16338 +# hostapd: https://github.com/openwrt/openwrt/pull/16338 - probably +# that change is raising issue with 6GHz network. Disabling... # Janusz fix: https://github.com/openwrt/openwrt/pull/16342 -name: BPI-R4 + BE14 + Luci + hostapd + EHT fix by Janusz +name: BPI-R4 + BE14 + Luci + EHT fix by Janusz on: workflow_dispatch: env: REMOTE_REPOSITORY: danpawlik/openwrt - REMOTE_BRANCH: be14-and-hostapd-janusz-v3 - RELEASE_PREFIX: Mediatek_mt7988a_bpi-r4_be14_luci_hostapd_eht + REMOTE_BRANCH: be14-and-hostapd-janusz-v4 + RELEASE_PREFIX: Mediatek_mt7988a_bpi-r4_be14_luci_eht DEVICE_CONFIG: configs/mediatek/mt7988a/bpi-r4 ROLE_CONFIG: configs/common/main-router @@ -33,7 +34,7 @@ jobs: echo "latest_commit_sha=$(git rev-parse HEAD)" >> $GITHUB_OUTPUT build: - name: Build BPI-R4 with BE14 + luci + hostapd + eht by Janusz + name: Build BPI-R4 with BE14 + luci + eht by Janusz needs: [check_commits] runs-on: ubuntu-24.04 steps: @@ -43,7 +44,8 @@ jobs: sudo apt install -y \ build-essential clang flex bison g++ gawk \ gcc-multilib g++-multilib gettext git libncurses5-dev libssl-dev \ - python3-setuptools rsync swig unzip zlib1g-dev file wget curl + python3-setuptools rsync swig unzip zlib1g-dev file wget curl zstd \ + git sudo apt full-upgrade -y - name: Checkout remote repository @@ -81,6 +83,8 @@ jobs: echo "CONFIG_PACKAGE_kmod-usb-serial-option=y" >> .config echo "CONFIG_PACKAGE_kmod-mtk-t7xx=y" >> .config echo "CONFIG_PACKAGE_kmod-usb-net-cdc-eem=y" >> .config + echo "CONFIG_PACKAGE_luci-proto-modemmanager=y" >> .config + echo "CONFIG_PACKAGE_usb-modeswitch=y" >> .config echo "CONFIG_PACKAGE_kmod-wireguard=y" >> .config echo "CONFIG_PACKAGE_wireguard-tools=y" >> .config echo "CONFIG_PACKAGE_luci-proto-wireguard=y" >> .config @@ -94,6 +98,9 @@ jobs: run: | grep "=m" .config | grep -v 'CONFIG_PACKAGE_libustream-mbedtls=m' | while read -r line; do module=$(echo "$line" | cut -f1 -d'='); sed -i "s/^$line$/# $module is not set/" .config; done + - name: Run once again defconfig + run: make -j $(nproc) defconfig + - name: Download dependencies run: make -j $(nproc) download @@ -135,9 +142,9 @@ jobs: with: files: bin/targets/mediatek/filogic/* tag_name: ${{ env.RELEASE_PREFIX }}-${{ env.REMOTE_BRANCH }}-${{ env.RELEASE_DATE }} - name: OpenWRT BPI-R4 + BE14 + luci + hostapd + EHT - ${{ env.REMOTE_BRANCH }} - ${{ env.RELEASE_DATE }} + name: OpenWRT BPI-R4 + BE14 + luci + + EHT - ${{ env.REMOTE_BRANCH }} - ${{ env.RELEASE_DATE }} body: | - Updated prebuilt images for ${{ env.RELEASE_DATE }} with BE14, hostapd and EHT support + Updated prebuilt images for ${{ env.RELEASE_DATE }} with BE14 and EHT support Build Commit: ${{ needs.check_commits.outputs.latest_commit_sha }} - name: Clean up old releases diff --git a/.github/workflows/bpi-r4-BE14.yaml b/.github/workflows/bpi-r4-BE14.yaml index ccba5d9..7a5c7fb 100644 --- a/.github/workflows/bpi-r4-BE14.yaml +++ b/.github/workflows/bpi-r4-BE14.yaml @@ -1,6 +1,6 @@ --- # Based on https://github.com/JuliusBairaktaris/Qualcommax_NSS_Builder/blob/main/.github/workflows/build.yaml -name: BPI-R4 + all packages + BE14 + hostapd + eht +name: BPI-R4 + all packages + BE14 + eht on: workflow_dispatch: @@ -9,7 +9,7 @@ env: REMOTE_REPOSITORY: danpawlik/openwrt # REMOTE_BRANCH: be14 REMOTE_BRANCH: be14-and-hostapd-janusz-v4 - RELEASE_PREFIX: Mediatek_mt7988a_bpi-r4_be14_all_packages_hostapd_eht + RELEASE_PREFIX: Mediatek_mt7988a_bpi-r4_be14_all_packages_eht DEVICE_CONFIG: configs/mediatek/mt7988a/bpi-r4 ROLE_CONFIG: configs/common/main-router @@ -43,7 +43,8 @@ jobs: sudo apt install -y \ build-essential clang flex bison g++ gawk \ gcc-multilib g++-multilib gettext git libncurses5-dev libssl-dev \ - python3-setuptools rsync swig unzip zlib1g-dev file wget curl + python3-setuptools rsync swig unzip zlib1g-dev file wget curl zstd \ + git sudo apt full-upgrade -y - name: Checkout remote repository @@ -78,6 +79,9 @@ jobs: run: | grep "=m" .config | grep -v 'CONFIG_PACKAGE_libustream-mbedtls=m' | while read -r line; do module=$(echo "$line" | cut -f1 -d'='); sed -i "s/^$line$/# $module is not set/" .config; done + - name: Run once again defconfig + run: make -j $(nproc) defconfig + - name: Download dependencies run: make -j $(nproc) download @@ -115,7 +119,7 @@ jobs: with: files: bin/targets/mediatek/filogic/* tag_name: ${{ env.RELEASE_PREFIX }}-${{ env.REMOTE_BRANCH }}-${{ env.RELEASE_DATE }} - name: OpenWRT BPI-R4 + BE14 + hostapd + eht + main_router packages - ${{ env.REMOTE_BRANCH }} - ${{ env.RELEASE_DATE }} + name: OpenWRT BPI-R4 + BE14 + eht + main_router packages - ${{ env.REMOTE_BRANCH }} - ${{ env.RELEASE_DATE }} body: | Updated prebuilt images for ${{ env.RELEASE_DATE }} with BE14, hostapd and all main_router packages Build Commit: ${{ needs.check_commits.outputs.latest_commit_sha }} diff --git a/.github/workflows/bpi-r4.yaml b/.github/workflows/bpi-r4.yaml index c1743e6..85f9435 100644 --- a/.github/workflows/bpi-r4.yaml +++ b/.github/workflows/bpi-r4.yaml @@ -7,8 +7,7 @@ on: env: REMOTE_REPOSITORY: openwrt/openwrt - # REMOTE_BRANCH: main - REMOTE_BRANCH: be14-and-hostapd-janusz-v4 + REMOTE_BRANCH: main RELEASE_PREFIX: Mediatek_mt7988a_bpi-r4_main_all_packages DEVICE_CONFIG: configs/mediatek/mt7988a/bpi-r4 ROLE_CONFIG: configs/common/main-router @@ -43,7 +42,8 @@ jobs: sudo apt install -y \ build-essential clang flex bison g++ gawk \ gcc-multilib g++-multilib gettext git libncurses5-dev libssl-dev \ - python3-setuptools rsync swig unzip zlib1g-dev file wget curl + python3-setuptools rsync swig unzip zlib1g-dev file wget curl zstd \ + git sudo apt full-upgrade -y - name: Checkout remote repository @@ -70,12 +70,23 @@ jobs: curl -SL https://raw.githubusercontent.com/danpawlik/openwrt-builder/master/configs/mediatek/mt7988a/bpi-r4 > .config curl -SL https://raw.githubusercontent.com/danpawlik/openwrt-builder/master/configs/common/main-router >> .config curl -SL https://raw.githubusercontent.com/danpawlik/openwrt-builder/master/configs/common/snapshot-short >> .config + +# - name: Enable openssl +# run: +# sed -i '/CONFIG_PACKAGE_wpad-mbedtls=y/d' .config +# curl -SL https://raw.githubusercontent.com/danpawlik/openwrt-builder/master/configs/common/openssl >> .config + + - name: Run defconfig + run: make defconfig - name: Remove packages that are marked as modules run: | grep "=m" .config | grep -v 'CONFIG_PACKAGE_libustream-mbedtls=m' | while read -r line; do module=$(echo "$line" | cut -f1 -d'='); sed -i "s/^$line$/# $module is not set/" .config; done + - name: Run once again defconfig + run: make -j $(nproc) defconfig + - name: Download dependencies run: make -j $(nproc) download