From 906b7f2d399efaf6eceae111a27b9cfce9827ead Mon Sep 17 00:00:00 2001
From: Pierre-Antoine Rouby <pierre-antoine.rouby@inrae.fr>
Date: Wed, 13 Sep 2023 12:56:09 +0200
Subject: [PATCH] ci: Minor fix.
---
.gitlab-ci.yml | 27 ++-------------------------
packages/make-windows-dir.bat | 2 +-
2 files changed, 3 insertions(+), 26 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8da46d1a..752d52bb 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -157,29 +157,6 @@ build-windows:
- dir
- copy ../packages/make-windows-dir.bat .\make-windows-dir.bat
- .\make-windows-dir.bat
- # # Copy Pamhyr
- # - copy /y dist\pamhyr pamhyr\
- # # Copy Pamhyr info
- # - copy /y ..\LICENSE pamhyr\pamhyr\
- # - copy /y ..\AUTHORS pamhyr\pamhyr\
- # - copy /y ..\VERSION pamhyr\pamhyr\
- # # Copy mage
- # - mkdir pamhyr\mage
- # - copy /y ..\mage-windows\* pamhyr\mage\
- # # Copy Pamhyr resources
- # - mkdir pamhyr\pamhyr\View
- # - mkdir pamhyr\pamhyr\View\ui
- # - mkdir pamhyr\pamhyr\View\ui\Widgets
- # - copy /y ..\src\View\ui\*.ui pamhyr\pamhyr\View\ui\
- # - copy /y ..\src\View\ui\ressources\ pamhyr\pamhyr\View\ui
- # - copy /y ..\src\View\ui\Widgets\*.ui pamhyr\pamhyr\View\ui\Widgets
- # # Copy lang
- # - mkdir pamhyr\pamhyr\lang
- # - copy /y ..\src\lang\*.qm pamhyr\pamhyr\lang
- # # Copy tests cases
- # - mkdir pamhyr\tests_cases\
- # - mkdir pamhyr\tests_cases\Saar
- # - copy ..\tests_cases\Saar\Saar.pamhyr pamhyr\tests_cases\Saar\
artifacts:
paths:
- windows/pamhyr
@@ -246,8 +223,8 @@ windows-package-exe:
- windows/pamhyr-windows.exe
script:
- cd windows
- - copy /y ..\packages\make-windows-exe.bat make-windows-exe.bat
- - copy /y ..\packages\pamhyr.nsi pamhyr.nsi
+ - copy ..\packages\make-windows-exe.bat make-windows-exe.bat
+ - copy ..\packages\pamhyr.nsi pamhyr.nsi
- .\make-windows-exe.bat
###########
diff --git a/packages/make-windows-dir.bat b/packages/make-windows-dir.bat
index 2d7391e8..18f9f490 100644
--- a/packages/make-windows-dir.bat
+++ b/packages/make-windows-dir.bat
@@ -17,7 +17,7 @@ rem along with this program. If not, see <https://www.gnu.org/licenses/>.
@ECHO ON
mkdir pamhyr\pamhyr
-copy /y dist\pamhyr pamhyr\pamhyr
+xcopy /y dist\pamhyr pamhyr\pamhyr
rem Copy data
mkdir pamhyr\pamhyr\lang
--
GitLab