From 096ad104145f60ca83140383d033b8a35a48bb98 Mon Sep 17 00:00:00 2001 From: Daniel Pawlik Date: Wed, 2 Oct 2024 21:27:49 +0200 Subject: [PATCH] Switch to v14-luci-eht-rmadrad; rename file --- ...{bpi-r4-BE14-janusz.yaml => bpi-r4-BE14-community.yaml} | 7 +++---- .github/workflows/bpi-r4-BE14.yaml | 6 +----- 2 files changed, 4 insertions(+), 9 deletions(-) rename .github/workflows/{bpi-r4-BE14-janusz.yaml => bpi-r4-BE14-community.yaml} (95%) diff --git a/.github/workflows/bpi-r4-BE14-janusz.yaml b/.github/workflows/bpi-r4-BE14-community.yaml similarity index 95% rename from .github/workflows/bpi-r4-BE14-janusz.yaml rename to .github/workflows/bpi-r4-BE14-community.yaml index 4c13a51..e40f56c 100644 --- a/.github/workflows/bpi-r4-BE14-janusz.yaml +++ b/.github/workflows/bpi-r4-BE14-community.yaml @@ -1,5 +1,4 @@ --- -# Janusz fix: https://github.com/openwrt/openwrt/pull/16342 # Luci fix: https://github.com/openwrt/luci/pull/7279 name: BPI-R4 + BE14 + EHT fix by Janusz + luci BE @@ -13,10 +12,10 @@ on: env: REMOTE_REPOSITORY: danpawlik/openwrt - REMOTE_BRANCH: be14-janusz-v12-luci + REMOTE_BRANCH: v14-luci-eht-rmadrad RELEASE_PREFIX: Mediatek_mt7988a_bpi-r4_be14_eht DEVICE_CONFIG: ${{ inputs.DEVICE_CONFIG == 'poe' && 'configs/mediatek/mt7988a/bpi-r4-poe' || 'configs/mediatek/mt7988a/bpi-r4' }} - ROLE_CONFIG: configs/common/main-router + ROLE_CONFIG: configs/common/community jobs: check_commits: @@ -70,7 +69,7 @@ jobs: sed -i '/CONFIG_PACKAGE_wpad-mbedtls=y/d' .config curl -SL https://raw.githubusercontent.com/${{ github.repository_owner }}/openwrt-builder/master/configs/common/openssl >> .config curl -SL https://raw.githubusercontent.com/${{ github.repository_owner }}/openwrt-builder/master/configs/common/lte-5g-modem >> .config - curl -SL https://raw.githubusercontent.com/${{ github.repository_owner }}/openwrt-builder/master/configs/common/community >> .config + curl -SL https://raw.githubusercontent.com/${{ github.repository_owner }}/openwrt-builder/master/${{ env.ROLE_CONFIG }} >> .config - name: Run defconfig run: | diff --git a/.github/workflows/bpi-r4-BE14.yaml b/.github/workflows/bpi-r4-BE14.yaml index 46359f5..d164960 100644 --- a/.github/workflows/bpi-r4-BE14.yaml +++ b/.github/workflows/bpi-r4-BE14.yaml @@ -1,5 +1,4 @@ --- -# Based on https://github.com/JuliusBairaktaris/Qualcommax_NSS_Builder/blob/main/.github/workflows/build.yaml name: BPI-R4 + all packages + BE14 + luci BE on: @@ -7,11 +6,8 @@ on: env: REMOTE_REPOSITORY: danpawlik/openwrt - # REMOTE_BRANCH: be14 - REMOTE_BRANCH: be14-janusz-v12-luci + REMOTE_BRANCH: v14-luci-eht-rmadrad RELEASE_PREFIX: Mediatek_mt7988a_bpi-r4_be14_all_packages_eht - DEVICE_CONFIG: configs/mediatek/mt7988a/bpi-r4 - ROLE_CONFIG: configs/common/main-router jobs: check_commits: