Changed build scripts: Only one source artifact, and ci skip support (#…

…1620) * Changed build scripts: Only one source artifact, and ci skip support * Capital **D** Co-authored-by: Semphris <[email protected]>
SuperTux · Dec 27, 2020 · d3dfa9a · d3dfa9a
1 parent 1953e47
commit d3dfa9a
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/.ci_scripts/package.sh b/.ci_scripts/package.sh
@@ -7,10 +7,14 @@ if [ "$OS_NAME" = "macos-latest" ] && [ "$PACKAGE" = "ON" ]; then
     cpack -G Bundle;
 fi
 
-if [ "$OS_NAME" = "ubuntu-latest" ] && [ "$PACKAGE" = "ON" ]; then
+# make only one source package
+if [ "$OS_NAME" = "ubuntu-latest" ] && [ "$COMPILER_NAME" = "gcc" ] && [ "$BUILD_NAME" = "Debug" ] && [ "$PACKAGE" = "ON" ]; then
     cpack --config CPackSourceConfig.cmake -G TGZ;
+fi
+
+if [ "$OS_NAME" = "ubuntu-latest" ] && [ "$PACKAGE" = "ON" ]; then
     ../.ci_scripts/build_appimage.sh
-    #extract built appimages for uploading
+    # extract built appimages for uploading
     mv ~/out/* .
 fi
 

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -10,6 +10,8 @@ on:
 # TODO the glbinding build
 jobs:
   build-supertux:
+    if: "!contains(github.event.head_commit.message, 'ci skip') && !contains(github.event.head_commit.message, 'skip ci')"
+
     strategy:
       fail-fast: false
       matrix:
@@ -89,6 +91,8 @@ jobs:
       - name: Package
         env:
           OS_NAME: ${{ matrix.os }}
+          COMPILER_NAME: ${{ matrix.compiler }}
+          BUILD_NAME: ${{ matrix.build_type }}
           PACKAGE: 'ON'
         working-directory: build
         run: ../.ci_scripts/package.sh
@@ -100,7 +104,7 @@ jobs:
           if-no-files-found: ignore
       - uses: actions/upload-artifact@v2
         with:
-          name: "${{ matrix.os }}-${{ matrix.compiler }}-${{ matrix.build_type }}-source"
+          name: "source"
           path: build/upload/*.tar.gz
           if-no-files-found: ignore
       - uses: actions/upload-artifact@v2