Merge branch 'parallel-mkassets'

* Branch commit log: misc/mkassets.sh: run checks and UI tests misc/Makefile.mk: pass jobserver to mkassets .github/workflows/testing.yml: skip IRC job if nektos/act set env.ACT doc/poxy.sh: test $GITHUB_ACTIONS for CI setup Signed-off-by: Tim Janik <[email protected]>
tim-janik · Jun 27, 2024 · fbbecd1 · fbbecd1
2 parents 11bfbe7 + a834303
commit fbbecd1
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 6 deletions.
diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml
@@ -106,8 +106,8 @@ jobs:
         make branch-check BRANCH_CHECK_EXIT=$BRANCH_CHECK_EXIT
 
   Ping-IRC:
-    if: ${{ always() }}
     needs: [FocalAssets, UploadDocs, ArchReplay, FocalClangTidy]
+    if: ${{ always() && !env.ACT }}
     runs-on: ubuntu-latest
     steps:
     - { uses: actions/[email protected],	with: { fetch-depth: 0 } } # Fix actions/checkout#290

diff --git a/doc/poxy.sh b/doc/poxy.sh
@@ -197,7 +197,7 @@ $UPLOAD && {
   rm -rf poxy/iodocs/
   (
     # Support for CI uploads
-    test -z "`git config user.email`" && {
+    test -n "$GITHUB_ACTIONS" && {
       export GIT_AUTHOR_EMAIL="[email protected]" GIT_AUTHOR_NAME="Anklang CI Action" # "github.com/tim-janik/anklang/actions/"
       export GIT_COMMITTER_EMAIL="$GIT_AUTHOR_EMAIL" GIT_COMMITTER_NAME="$GIT_AUTHOR_NAME"
       GIT_SSH_COMMAND="ssh -o BatchMode=yes -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no"

diff --git a/misc/Makefile.mk b/misc/Makefile.mk
@@ -141,6 +141,6 @@ CLEANDIRS += $>/appimagetools/
 # == mkassets ==
 # Let misc/mkassets.sh do the work, just pre-cache needed downloads
 mkassets: $>/appimagetools/appimage-runtime-zstd
-	$Q exec misc/mkassets.sh
+	+$Q exec misc/mkassets.sh
 .PHONY: mkassets
 CLEANDIRS += $>/mkdeb/
diff --git a/misc/mkassets.sh b/misc/mkassets.sh
@@ -33,9 +33,8 @@ __EOF
 ( cd $BUILDDIR/
   # Note, ase/ special cases MODE=production INSN=sse as non march=native release builds
   make -w V=${V:-} default MODE=production INSN=sse
-  make -w V=${V:-} -j`nproc` \
-       all assets/pdf
-  make -w V=${V:-} check
+  make -w V=${V:-} all assets/pdf
+  make -w V=${V:-} check x11test-v
   misc/mkdeb.sh
   misc/mkAppImage.sh
 )