update github workflow

.github/workflows/cmake-ubuntu.yml

@@ -2,7 +2,7 @@ name: CMake Ubuntu
 
 on:
   push:
-    branches: [ "master" ]
+    branches: [ "master", "windows-setup" ]
   pull_request:
     branches: [ "master" ]
 

.github/workflows/cmake-windows.yml

@@ -2,7 +2,7 @@ name: CMake Windows
 
 on:
   push:
-    branches: [ "master" ]
+    branches: [ "master", "windows-setup" ]
   pull_request:
     branches: [ "master" ]
 
@@ -31,7 +31,6 @@ jobs:
           mingw-w64-x86_64-cmake
           mingw-w64-x86_64-ninja
           mingw-w64-x86_64-gcc
-          mingw-w64-x86_64-pkg-config
           mingw-w64-x86_64-vala       
           mingw-w64-x86_64-libgee
           mingw-w64-x86_64-poppler
@@ -42,9 +41,13 @@ jobs:
           mingw-w64-x86_64-libsoup
           mingw-w64-x86_64-qrencode
           mingw-w64-x86_64-discount
-
-    - name: Configure CMake
-      run: cmake -B build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_MAKE_PROGRAM=ninja -DMDVIEW=OFF
+          mingw-w64-x86_64-nsis
 
     - name: Build
-      run: cd build && ninja
+      run: cd windows-setup && ./package.sh
+
+    - name: Upload installer artifact
+      uses: actions/upload-artifact@v3
+      with:
+        name: pdfpc-setup
+        path: windows-setup/pdfpc-setup.exe

windows-setup/package.sh

@@ -20,7 +20,7 @@ mkdir "$setup_dir"/lib
 mkdir -p ../build
 
 echo "copy installed files"
-(cd ../build && cmake .. -DMDVIEW=OFF -DCMAKE_MAKE_PROGRAM=ninja -DMOVIES=ON -DCMAKE_INSTALL_PREFIX= && DESTDIR=../windows-setup/"$setup_dir" cmake --build . --target install)
+(cd ../build && cmake .. -DMDVIEW=OFF -DCMAKE_MAKE_PROGRAM=ninja -DCMAKE_BUILD_TYPE=Release -DMOVIES=ON -DCMAKE_INSTALL_PREFIX= && DESTDIR=../windows-setup/"$setup_dir" cmake --build . --target install)
 
 echo $(pwd)
 echo "copy libraries"
@@ -50,7 +50,6 @@ cp /mingw64/bin/gdbus.exe "$setup_dir"/bin
 
 echo "create installer"
 bash make_version_nsh.sh
-exit
 "/c/Program Files (x86)/NSIS/Bin/makensis.exe" pdfpc.nsi
 
 echo "finished"