From f1e523aa176d238ff78dd6ada9d747e5c6d667fb Mon Sep 17 00:00:00 2001 From: John Doe Date: Mon, 26 Sep 2022 07:43:01 +0800 Subject: [PATCH] Revert "Build: fix r5s" This reverts commit f6d27ac0efbd0cdc962a67adf314f879551a5ca0. --- .github/workflows/r5s.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/r5s.yml b/.github/workflows/r5s.yml index b70b291..ca706cd 100644 --- a/.github/workflows/r5s.yml +++ b/.github/workflows/r5s.yml @@ -19,7 +19,6 @@ jobs: env: TG: ${{ secrets.TELEGRAM_BOT_TOKEN }} DEVICE: r5s - BRANCH: master steps: @@ -108,12 +107,13 @@ jobs: ./scripts/feeds update -a ./scripts/feeds install -a . $GITHUB_WORKSPACE/scripts/merge_packages.sh + BRANCH='master' . $GITHUB_WORKSPACE/scripts/patches.sh - name: compile run: | cd friendlywrt-rk3568 - ./build.sh nanopi_r5s.mk || (cd friendlywrt && make V=sc && exit 255) + ./build.sh nanopi_r5s.mk || (cd friendlywrt && make V=sc) cd friendlywrt make target/imagebuilder/compile