parouby
/
Pamhyr2
mirror of https://gitlab.com/pamhyr/pamhyr2
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ci: Disable mage build for windows.

results
Pierre-Antoine Rouby 2023-08-01 11:08:28 +02:00
parent 099ed29d06
commit 3d47502179
2 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
.gitlab-ci.yml
View File

@ -16,7 +16,7 @@ build-mage-linux:
- if: $CI_COMMIT_BRANCH == 'master' || $CI_COMMIT_TAG - if: $CI_COMMIT_BRANCH == 'master' || $CI_COMMIT_TAG
variables: variables:
GIT_SUBMODULE_STRATEGY: recursive GIT_SUBMODULE_STRATEGY: recursive
GIT_SUBMODULE_DEPTH: 1 GIT_SUBMODULE_DEPTH: 20
script: script:
- cd mage/src/ - cd mage/src/
- mkdir -p build - mkdir -p build
@ -29,30 +29,30 @@ build-mage-linux:
- mage/src/build/mage_extraire - mage/src/build/mage_extraire
- mage/src/build/mailleurPF - mage/src/build/mailleurPF
build-mage-windows: # build-mage-windows:
stage: build # stage: build
tags: # tags:
- wine # - wine
rules: # rules:
- if: $CI_COMMIT_BRANCH == 'master' || $CI_COMMIT_TAG # - if: $CI_COMMIT_BRANCH == 'master' || $CI_COMMIT_TAG
variables: # variables:
GIT_SUBMODULE_STRATEGY: recursive # GIT_SUBMODULE_STRATEGY: recursive
GIT_SUBMODULE_DEPTH: 1 # GIT_SUBMODULE_DEPTH: 20
script: # script:
- cd mage/src/ # - cd mage/src/
- sed s/add_compile_definitions(win)/add_compile_definitions(windows)/ CMakeLists.txt > __tmp__ # - sed s/add_compile_definitions(win)/add_compile_definitions(windows)/ CMakeLists.txt > __tmp__
- echo set(CMAKE_Fortran_COMPILER "C:/Program\ Files/gcc/bin/gfortran.exe") > CMakeLists.txt # - echo set(CMAKE_Fortran_COMPILER "C:/Program\ Files/gcc/bin/gfortran.exe") > CMakeLists.txt
- echo set(CMAKE_MAKE_PROGRAM "C:/Program Files\ \(x86\)/GnuWin32/bin/make.exe") >> CMakeLists.txt # - echo set(CMAKE_MAKE_PROGRAM "C:/Program Files\ \(x86\)/GnuWin32/bin/make.exe") >> CMakeLists.txt
- type __tmp__ >> CMakeLists.txt # - type __tmp__ >> CMakeLists.txt
- mkdir build # - mkdir build
- cd build # - cd build
- cmake -G "MinGW Makefiles" .. # - cmake -G "MinGW Makefiles" ..
- make # - make
artifacts: # artifacts:
paths: # paths:
- mage/src/build/mage.exe # - mage/src/build/mage.exe
- mage/src/build/mage_extraire.exe # - mage/src/build/mage_extraire.exe
- mage/src/build/mailleurPF.exe # - mage/src/build/mailleurPF.exe
build: build:
stage: build stage: build
@ -120,8 +120,8 @@ windows-package:
artifacts: true artifacts: true
- job: build - job: build
artifacts: true artifacts: true
- job: build-mage-windows # - job: build-mage-windows
artifacts: true # artifacts: true
rules: rules:
- if: $CI_COMMIT_BRANCH == 'master' || $CI_COMMIT_TAG - if: $CI_COMMIT_BRANCH == 'master' || $CI_COMMIT_TAG
artifacts: artifacts:

6
packages/windows.bat
View File

@ -24,9 +24,9 @@ copy /y ..\VERSION dist\pamhyr\
copy /y ..\AUTHORS dist\pamhyr\ copy /y ..\AUTHORS dist\pamhyr\
rem MAGE rem MAGE
copy /y ..\mage\src\build\mage.exe dist\pamhyr\ rem copy /y ..\mage\src\build\mage.exe dist\pamhyr\
copy /y ..\mage\src\build\mage_extraire.exe dist\pamhyr\ rem copy /y ..\mage\src\build\mage_extraire.exe dist\pamhyr\
copy /y ..\mage\src\build\mailleurPF.exe dist\pamhyr\ rem copy /y ..\mage\src\build\mailleurPF.exe dist\pamhyr\
rem Make installer rem Make installer
"C:\Program Files (x86)\NSIS\makensis.exe" pamhyr.nsi "C:\Program Files (x86)\NSIS\makensis.exe" pamhyr.nsi