Do not rebase on the top of main remote temporary for BE14

This commit is contained in:
Daniel Pawlik
2024-08-18 21:39:38 +02:00
parent 5688c5ddc3
commit 276114dcbe

View File

@@ -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