Skip to content

Commit 2a4c9a6

Browse files
committed
ci: try to fix r2pro build (reset build.conf after createimg)
1 parent 4aa3621 commit 2a4c9a6

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

.github/workflows/build.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
atf: true
3636

3737
- board: bpi-r2pro
38-
boots: "sdmmc emmc"
38+
boots: "sdmmc"
3939
atf: false
4040

4141
- board: bpi-r3
@@ -112,9 +112,9 @@ jobs:
112112
bash build.sh build
113113
bash build.sh rename
114114
115-
git checkout build.conf
116115
# ATF builds (optional)
117116
if [ "${{ matrix.atf }}" = "true" ]; then
117+
git checkout build.conf
118118
echo "---- ATF build for $boot ----"
119119
120120
git checkout $ATF_BRANCH
@@ -135,11 +135,11 @@ jobs:
135135
bash build.sh build
136136
bash build.sh rename
137137
fi
138+
rm -f build.conf
138139
else
139140
bash build.sh createimg non-interactive
141+
git checkout build.conf
140142
fi
141-
142-
rm -f build.conf
143143
done
144144
145145
- name: Upload artifacts

0 commit comments

Comments
 (0)