From e4d1a9c5445bbd2941857a4bb346e312baeb4308 Mon Sep 17 00:00:00 2001 From: MichaIng Date: Sun, 28 Apr 2024 17:24:25 +0200 Subject: [PATCH] debugging --- .github/workflows/armbian.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/armbian.yml b/.github/workflows/armbian.yml index 5b68f9f816..793add795d 100644 --- a/.github/workflows/armbian.yml +++ b/.github/workflows/armbian.yml @@ -56,7 +56,7 @@ jobs: elif [ "$branch" != 'dietpi' ] then git fetch origin dietpi - git rebase dietpi + git rebase origin/dietpi fi if [ "$owner" != 'armbian' ] then @@ -66,13 +66,11 @@ jobs: elif [ "$branch" != 'main' ] then git fetch origin main - git rebase main + git rebase origin/main fi - name: Build asset run: | cd build - # Add python executable for legacy s5p6818 builds - sudo ln -sv python3 /usr/bin/python ./compile.sh '${{ github.event.inputs.asset }}' BRANCH='${{ github.event.inputs.branch }}' BOARD='${{ github.event.inputs.board }}' - name: Upload run: |