From 39c71788d8bd830d03817ec8f3ceda49df668273 Mon Sep 17 00:00:00 2001 From: Daniel Pawlik Date: Sat, 23 Nov 2024 10:12:48 +0100 Subject: [PATCH] Configure openssl in GH workflows as separate task --- .github/workflows/4a-giga.yaml | 6 ++++++ .github/workflows/ax3200.yaml | 6 ++++++ .github/workflows/ax3600.yaml | 6 ++++++ .github/workflows/bpi-r4-BE14-community.yaml | 7 +++++-- .github/workflows/bpi-r4-BE14.yaml | 6 ++++++ .github/workflows/bpi-r4-mediatek.yaml | 11 +++++++++-- .github/workflows/rpi-5.yaml | 5 ++++- .github/workflows/u6lite.yaml | 8 ++++++++ .github/workflows/unifi_ac_lr.yaml | 8 ++++++++ 9 files changed, 58 insertions(+), 5 deletions(-) diff --git a/.github/workflows/4a-giga.yaml b/.github/workflows/4a-giga.yaml index 7cb6e38..2941e87 100644 --- a/.github/workflows/4a-giga.yaml +++ b/.github/workflows/4a-giga.yaml @@ -61,8 +61,14 @@ jobs: curl -SL https://raw.githubusercontent.com/danpawlik/openwrt-builder/master/configs/ramips/mt7621/4a-giga > .config curl -SL https://raw.githubusercontent.com/danpawlik/openwrt-builder/master/configs/common/dumb_ap >> .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 diff --git a/.github/workflows/ax3200.yaml b/.github/workflows/ax3200.yaml index d525ebc..28ad501 100644 --- a/.github/workflows/ax3200.yaml +++ b/.github/workflows/ax3200.yaml @@ -61,8 +61,14 @@ jobs: curl -SL https://raw.githubusercontent.com/danpawlik/openwrt-builder/master/configs/mediatek/mt7622/ax3200 > .config curl -SL https://raw.githubusercontent.com/danpawlik/openwrt-builder/master/configs/common/dumb_ap >> .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 diff --git a/.github/workflows/ax3600.yaml b/.github/workflows/ax3600.yaml index f7a4ebf..8ee5d87 100644 --- a/.github/workflows/ax3600.yaml +++ b/.github/workflows/ax3600.yaml @@ -61,8 +61,14 @@ jobs: curl -SL https://raw.githubusercontent.com/danpawlik/openwrt-builder/master/${{ env.DEVICE_CONFIG }} > .config curl -SL https://raw.githubusercontent.com/danpawlik/openwrt-builder/master/${{ env.ROLE_CONFIG }} >> .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 diff --git a/.github/workflows/bpi-r4-BE14-community.yaml b/.github/workflows/bpi-r4-BE14-community.yaml index 7f9a081..5ead79c 100644 --- a/.github/workflows/bpi-r4-BE14-community.yaml +++ b/.github/workflows/bpi-r4-BE14-community.yaml @@ -83,11 +83,14 @@ jobs: curl -SL https://raw.githubusercontent.com/${{ github.repository_owner }}/openwrt-builder/master/${{ env.DEVICE_CONFIG }} > .config curl -SL https://raw.githubusercontent.com/${{ github.repository_owner }}/openwrt-builder/master/configs/common/luci >> .config curl -SL https://raw.githubusercontent.com/${{ github.repository_owner }}/openwrt-builder/master/configs/common/snapshot-short >> .config - 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/${{ env.ROLE_CONFIG }} >> .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 diff --git a/.github/workflows/bpi-r4-BE14.yaml b/.github/workflows/bpi-r4-BE14.yaml index 15a3cc2..1ebae10 100644 --- a/.github/workflows/bpi-r4-BE14.yaml +++ b/.github/workflows/bpi-r4-BE14.yaml @@ -67,8 +67,14 @@ 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 diff --git a/.github/workflows/bpi-r4-mediatek.yaml b/.github/workflows/bpi-r4-mediatek.yaml index 98fda28..936b1bb 100644 --- a/.github/workflows/bpi-r4-mediatek.yaml +++ b/.github/workflows/bpi-r4-mediatek.yaml @@ -81,11 +81,18 @@ jobs: curl -SL "https://raw.githubusercontent.com/${{ github.repository_owner }}/openwrt-builder/master/${{ env.DEVICE_CONFIG }}" > .config curl -SL "https://raw.githubusercontent.com/${{ github.repository_owner }}/openwrt-builder/master/configs/common/luci" >> .config curl -SL "https://raw.githubusercontent.com/${{ github.repository_owner }}/openwrt-builder/master/configs/common/snapshot-short" >> .config - 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/${{ env.ROLE_CONFIG }}" >> .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 + # Full diff list is here: https://github.com/danpawlik/openwrt-builder/commit/13e8e751e28e9a9bd852e427b89ed4f3bc0cf15d#diff-c5c79fcc9dff2632be242ed35cef9527aab61e542217f71cd2d396155c976ec4R49 - name: Set configs, that were set in Mediatek Feed prepare step run: | diff --git a/.github/workflows/rpi-5.yaml b/.github/workflows/rpi-5.yaml index 1404a1e..7bdcad3 100644 --- a/.github/workflows/rpi-5.yaml +++ b/.github/workflows/rpi-5.yaml @@ -84,8 +84,11 @@ jobs: curl -SL https://raw.githubusercontent.com/${{ github.repository_owner }}/openwrt-builder/master/${{ env.DEVICE_CONFIG }} > .config curl -SL https://raw.githubusercontent.com/${{ github.repository_owner }}/openwrt-builder/master/configs/common/luci >> .config curl -SL https://raw.githubusercontent.com/${{ github.repository_owner }}/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/${{ github.repository_owner }}/openwrt-builder/master/configs/common/openssl >> .config + curl -SL https://raw.githubusercontent.com/danpawlik/openwrt-builder/master/configs/common/openssl >> .config - name: Run defconfig run: | diff --git a/.github/workflows/u6lite.yaml b/.github/workflows/u6lite.yaml index d78caa2..02a9ceb 100644 --- a/.github/workflows/u6lite.yaml +++ b/.github/workflows/u6lite.yaml @@ -62,6 +62,14 @@ jobs: curl -SL "https://raw.githubusercontent.com/danpawlik/openwrt-builder/master/$DEVICE_CONFIG" > .config curl -SL "https://raw.githubusercontent.com/danpawlik/openwrt-builder/master/$ROLE_CONFIG" >> .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 diff --git a/.github/workflows/unifi_ac_lr.yaml b/.github/workflows/unifi_ac_lr.yaml index aa0d247..495ca8e 100644 --- a/.github/workflows/unifi_ac_lr.yaml +++ b/.github/workflows/unifi_ac_lr.yaml @@ -62,6 +62,14 @@ jobs: curl -SL "https://raw.githubusercontent.com/danpawlik/openwrt-builder/master/$DEVICE_CONFIG" > .config curl -SL "https://raw.githubusercontent.com/danpawlik/openwrt-builder/master/$ROLE_CONFIG" >> .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