@@ -195,22 +195,18 @@ jobs:
195
195
restore-keys : |
196
196
ccache-${{ matrix.arch }}-${{ matrix.branch }}-
197
197
198
- - name : Build packages
199
- id : build
198
+ - name : Init packages
199
+ id : init
200
200
working-directory : ' /builder'
201
201
env :
202
202
FAKE_BUILD : ${{ env.FAKE_BUILD == 'true' || ( env.TEST_BUILD == 'true' && matrix.branch == 'SNAPSHOT' ) }}
203
203
BUILD_DATE : ${{ needs.check.outputs.build_date }}
204
- DATE : ${{ needs.check.outputs.date }}
205
- SHA : ${{ needs.check.outputs.sha }}
206
204
ARCH : ${{ matrix.arch }}
207
205
BRANCH : ${{ matrix.branch }}
208
206
SIGN_KEY : ${{ secrets.SIGN_PRIVATE_KEY }}
209
207
CCACHE_DIR : ' /builder/.ccache'
210
208
shell : bash
211
209
run : |
212
- MAKE_JOBS=$(($(nproc)+1))
213
- echo "$MAKE_JOBS thread compile"
214
210
PKGDIR=$GITHUB_WORKSPACE/zapret-openwrt
215
211
MKFN=$PKGDIR/luci-app-zapret/Makefile
216
212
PKGVER=$( grep -s '^PKG_VERSION:=.*' $MKFN | cut -d'=' -f2 )
@@ -226,6 +222,28 @@ jobs:
226
222
if [ "$FAKE_BUILD" = "false" ]; then
227
223
./scripts/feeds update base packages luci
228
224
./scripts/feeds install -a
225
+ fi
226
+ echo "FAKE_BUILD=$FAKE_BUILD" >> $GITHUB_ENV
227
+ echo "PKGVER=$PKGVER" >> $GITHUB_ENV
228
+ echo "pkgver=$PKGVER" >> $GITHUB_OUTPUT
229
+ echo "status=success" >> $GITHUB_OUTPUT
230
+
231
+ - name : Build packages
232
+ id : build
233
+ if : steps.init.outputs.status == 'success'
234
+ working-directory : ' /builder'
235
+ env :
236
+ BUILD_DATE : ${{ needs.check.outputs.build_date }}
237
+ ARCH : ${{ matrix.arch }}
238
+ BRANCH : ${{ matrix.branch }}
239
+ SIGN_KEY : ${{ secrets.SIGN_PRIVATE_KEY }}
240
+ CCACHE_DIR : ' /builder/.ccache'
241
+ shell : bash
242
+ run : |
243
+ MAKE_JOBS=$(($(nproc)+1))
244
+ echo "$MAKE_JOBS thread compile"
245
+
246
+ if [ "$FAKE_BUILD" = "false" ]; then
229
247
make defconfig
230
248
sed -i 's/CONFIG_LUCI_JSMIN=y/CONFIG_LUCI_JSMIN=n/g' .config
231
249
echo "------------- .config BEG -------------------"
@@ -261,8 +279,8 @@ jobs:
261
279
./staging_dir/host/bin/ccache --max-size=10M --show-stats
262
280
263
281
echo "OUTDIR=$OUTDIR" >> $GITHUB_ENV
264
- echo "PKGVER=$PKGVER" >> $GITHUB_ENV
265
282
echo "pkgver=$PKGVER" >> $GITHUB_OUTPUT
283
+ echo "status=success" >> $GITHUB_OUTPUT
266
284
267
285
- name : Compress build logs
268
286
if : always()
0 commit comments