Skip to content

Commit

Permalink
update github workflow
Browse files Browse the repository at this point in the history
  • Loading branch information
Malex14 committed Jul 29, 2023
1 parent f2598d1 commit 5c6380b
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 7 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/cmake-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: CMake Windows

on:
push:
branches: [ "master" ]
branches: [ "master", "windows-setup" ]
pull_request:
branches: [ "master" ]

Expand Down Expand Up @@ -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
Expand All @@ -42,9 +41,10 @@ jobs:
mingw-w64-x86_64-libsoup
mingw-w64-x86_64-qrencode
mingw-w64-x86_64-discount
mingw-w64-x86_64-nsis
- name: Configure CMake
run: cmake -B build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_MAKE_PROGRAM=ninja -DMDVIEW=OFF
#- name: Install NSIS
# run: Install-Binary -Url "https://downloads.sourceforge.net/project/nsis/NSIS%203/3.09/nsis-3.09-setup.exe" -Name "nsis-3.09-setup.exe" -ArgumentList ('/S')

- name: Build
run: cd build && ninja
run: cd windows-setup && ./package.sh
3 changes: 1 addition & 2 deletions windows-setup/package.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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"

0 comments on commit 5c6380b

Please sign in to comment.