From 276114dcbea72daeab74c25436dd7271a9ddc3ea Mon Sep 17 00:00:00 2001 From: Daniel Pawlik Date: Sun, 18 Aug 2024 21:39:38 +0200 Subject: [PATCH] Do not rebase on the top of main remote temporary for BE14 --- .github/workflows/bpi-r4-BE14.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/bpi-r4-BE14.yaml b/.github/workflows/bpi-r4-BE14.yaml index fadc5a3..ffc8497 100644 --- a/.github/workflows/bpi-r4-BE14.yaml +++ b/.github/workflows/bpi-r4-BE14.yaml @@ -62,22 +62,22 @@ jobs: git am --keep-cr --signoff < 0001-Add-kmod-thermal-for-BPI-R4.patch git am --keep-cr --signoff < 0001-Add-mt7925-firmware-rule.patch - - name: Add OpenWRT remote and update - run: | - git remote add omain https://github.com/openwrt/openwrt - git remote update omain - git pull omain main --rebase +# - name: Add OpenWRT remote and update +# run: | +# git remote add omain https://github.com/openwrt/openwrt +# git remote update omain +# git pull omain main --rebase - name: Update and install feeds run: | ./scripts/feeds update -a ./scripts/feeds install -a -# curl -SL https://raw.githubusercontent.com/danpawlik/openwrt-builder/master/configs/common/snapshot-short >> .config - name: Configure firmware image run: | 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 make defconfig - name: Remove packages that are marked as modules