chore: push action-gh-release from v1 to v2

speed47 · May 8, 2024 · e175b6f · e175b6f
1 parent dfd5808
commit e175b6f
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 9 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -32,7 +32,9 @@ jobs:
           set +x
           ./configure ${{ matrix.clionly }} --with-werror
       - name: make
-        run: make -j$(sysctl -n hw.ncpu || 2)
+        run: |
+          cat Makefile.config
+          make -j$(sysctl -n hw.ncpu || 2)
       - name: check executability
         run: ./dvdisaster --version
       - name: check executable (GUI)
@@ -49,7 +51,7 @@ jobs:
         run: ./.github/workflows/make-mac-app.sh ${{ github.ref }}
         id: dist
       - name: Release
-        uses: softprops/action-gh-release@v1
+        uses: softprops/action-gh-release@v2
         with:
           files: ${{ steps.dist.outputs.archive }}
           draft: true
@@ -112,7 +114,7 @@ jobs:
           cd dist
           dvdisaster.exe --version
       - name: Release
-        uses: softprops/action-gh-release@v1
+        uses: softprops/action-gh-release@v2
         with:
           files: ${{ steps.dist.outputs.archive }}
           draft: true
@@ -138,7 +140,7 @@ jobs:
         run: ./.github/workflows/make-dist.sh ${{ github.ref }}
         id: dist
       - name: Release
-        uses: softprops/action-gh-release@v1
+        uses: softprops/action-gh-release@v2
         with:
           files: ${{ steps.dist.outputs.archive }}
           draft: true
@@ -195,7 +197,7 @@ jobs:
           echo "archive=$archive" >> "$GITHUB_OUTPUT"
           echo "appimage is <$archive>"
       - name: Release
-        uses: softprops/action-gh-release@v1
+        uses: softprops/action-gh-release@v2
         with:
           files: ${{ steps.dist.outputs.archive }}
           draft: true
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -32,7 +32,11 @@ jobs:
           set +x
           ./configure ${{ matrix.clionly }} ${{ matrix.debugprintf }} --with-werror
     - name: make
-      run: make -j$(sysctl -n hw.ncpu || 2)
+      run: |
+        cat Makefile.config
+        echo xxxxxxxxxxxxxxxxxxxxxxx
+        grep -i icon GNUmakefile
+        make -j$(sysctl -n hw.ncpu || 2)
     - name: check executability
       run: ./dvdisaster --version
     - name: check executable (GUI)

diff --git a/GNUmakefile.template b/GNUmakefile.template
@@ -118,11 +118,11 @@ ${BUILDTMP}/build.o : src/build.c src/build.h
 	@echo "Compiling:" src/build.o
 	@$(CC) $(COPTS) -c src/build.c -o $@
 
-${BUILDTMP}/closure.o : src/closure.c src/inlined-icons.h
+${BUILDTMP}/closure.o : src/closure.c $(ICONS)
 	@echo "Compiling:" src/closure.c
 	@$(CC) $(COPTS) -c src/closure.c -o $@
 
-${BUILDTMP}/icon-factory.o : src/icon-factory.c src/inlined-icons.h
+${BUILDTMP}/icon-factory.o : src/icon-factory.c $(ICONS)
 	@echo "Compiling:" src/icon-factory.c
 	@$(CC) $(COPTS) -c src/icon-factory.c -o $@
 

diff --git a/src/closure.c b/src/closure.c
@@ -23,7 +23,10 @@
 /*** src type: some GUI code ***/
 
 #include "dvdisaster.h"
-#include "inlined-icons.h"
+
+#ifdef WITH_GUI_YES
+ #include "inlined-icons.h"
+#endif
 
 #if 0 
  #define Verbose g_printf