From 3d4750217975be847eb4f5eb3a2059566b2fb010 Mon Sep 17 00:00:00 2001 From: Pierre-Antoine Rouby Date: Tue, 1 Aug 2023 11:08:28 +0200 Subject: [PATCH] ci: Disable mage build for windows. --- .gitlab-ci.yml | 54 ++++++++++++++++++++++---------------------- packages/windows.bat | 6 ++--- 2 files changed, 30 insertions(+), 30 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 87578db8..2cbfbd42 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -16,7 +16,7 @@ build-mage-linux: - if: $CI_COMMIT_BRANCH == 'master' || $CI_COMMIT_TAG variables: GIT_SUBMODULE_STRATEGY: recursive - GIT_SUBMODULE_DEPTH: 1 + GIT_SUBMODULE_DEPTH: 20 script: - cd mage/src/ - mkdir -p build @@ -29,30 +29,30 @@ build-mage-linux: - mage/src/build/mage_extraire - mage/src/build/mailleurPF -build-mage-windows: - stage: build - tags: - - wine - rules: - - if: $CI_COMMIT_BRANCH == 'master' || $CI_COMMIT_TAG - variables: - GIT_SUBMODULE_STRATEGY: recursive - GIT_SUBMODULE_DEPTH: 1 - script: - - cd mage/src/ - - 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_MAKE_PROGRAM "C:/Program Files\ \(x86\)/GnuWin32/bin/make.exe") >> CMakeLists.txt - - type __tmp__ >> CMakeLists.txt - - mkdir build - - cd build - - cmake -G "MinGW Makefiles" .. - - make - artifacts: - paths: - - mage/src/build/mage.exe - - mage/src/build/mage_extraire.exe - - mage/src/build/mailleurPF.exe +# build-mage-windows: +# stage: build +# tags: +# - wine +# rules: +# - if: $CI_COMMIT_BRANCH == 'master' || $CI_COMMIT_TAG +# variables: +# GIT_SUBMODULE_STRATEGY: recursive +# GIT_SUBMODULE_DEPTH: 20 +# script: +# - cd mage/src/ +# - 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_MAKE_PROGRAM "C:/Program Files\ \(x86\)/GnuWin32/bin/make.exe") >> CMakeLists.txt +# - type __tmp__ >> CMakeLists.txt +# - mkdir build +# - cd build +# - cmake -G "MinGW Makefiles" .. +# - make +# artifacts: +# paths: +# - mage/src/build/mage.exe +# - mage/src/build/mage_extraire.exe +# - mage/src/build/mailleurPF.exe build: stage: build @@ -120,8 +120,8 @@ windows-package: artifacts: true - job: build artifacts: true - - job: build-mage-windows - artifacts: true + # - job: build-mage-windows + # artifacts: true rules: - if: $CI_COMMIT_BRANCH == 'master' || $CI_COMMIT_TAG artifacts: diff --git a/packages/windows.bat b/packages/windows.bat index 453b0d03..0b276812 100644 --- a/packages/windows.bat +++ b/packages/windows.bat @@ -24,9 +24,9 @@ copy /y ..\VERSION dist\pamhyr\ copy /y ..\AUTHORS dist\pamhyr\ rem MAGE -copy /y ..\mage\src\build\mage.exe dist\pamhyr\ -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\mage.exe dist\pamhyr\ +rem copy /y ..\mage\src\build\mage_extraire.exe dist\pamhyr\ +rem copy /y ..\mage\src\build\mailleurPF.exe dist\pamhyr\ rem Make installer "C:\Program Files (x86)\NSIS\makensis.exe" pamhyr.nsi