diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a5e720ac..a29475e8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -38,6 +38,7 @@ variables: variables: MAGE_8_VERSION: "permalink/latest" ADISTS_VERSION: "permalink/latest" + RUBAR_VERSION: "permalink/latest" dl-mage8-doc: stage: downloads @@ -111,6 +112,36 @@ dl-adists-windows: paths: - adists-windows/adists.exe +dl-rubar-linux: + stage: downloads + tags: + - linux + rules: + - if: $CI_COMMIT_BRANCH == 'ci-test' || $CI_COMMIT_BRANCH == 'master' || $CI_COMMIT_TAG + script: + - curl -L -o rubar.tgz https://forge.inrae.fr/river-hydraulics/rubarbe/-/releases/$RUBAR_VERSION/downloads/packages/rubar_linux.tgz + - mkdir -p rubar-linux + - cd rubar-linux + - tar xvf ../rubar.tgz + artifacts: + paths: + - rubar-linux/rubarbe + +dl-rubar-windows: + stage: downloads + tags: + - linux + rules: + - if: $CI_COMMIT_BRANCH == 'ci-test' || $CI_COMMIT_BRANCH == 'master' || $CI_COMMIT_TAG + script: + - curl -L -o rubar.tgz https://forge.inrae.fr/river-hydraulics/rubarbe/-/releases/$RUBAR_VERSION/downloads/packages/rubar_windows.tgz + - mkdir -p rubar-windows + - cd rubar-windows + - tar xvf ../rubar.tgz + artifacts: + paths: + - rubar-windows/rubarbe.exe + ############# # CONFIGURE # ############# @@ -273,6 +304,8 @@ build-linux: needs: - job: dl-adists-linux artifacts: true + - job: dl-rubar-linux + artifacts: true - job: dl-mage8-linux artifacts: true - job: dl-mage8-doc @@ -314,6 +347,9 @@ build-linux: # Copy adists - mkdir -p pamhyr/adists - cp -v ../adists-linux/* pamhyr/adists/ + # Copy rubar + - mkdir -p pamhyr/rubar + - cp -v ../rubar-linux/* pamhyr/rubar/ # Copy Pamhyr - cp -r dist/pamhyr/* pamhyr/ # Pamhyr script to force x11 @@ -379,6 +415,8 @@ build-windows: artifacts: true - job: dl-adists-windows artifacts: true + - job: dl-rubar-windows + artifacts: true - job: dl-mage8-doc artifacts: true - job: set-version diff --git a/packages/make-windows-dir.bat b/packages/make-windows-dir.bat index 806eb643..99fc1dc2 100644 --- a/packages/make-windows-dir.bat +++ b/packages/make-windows-dir.bat @@ -46,6 +46,10 @@ copy /y ..\mage8-windows\mage_extraire.exe pamhyr\mage8\ copy /y ..\mage8-windows\mailleurTT.exe pamhyr\mage8\ copy /y ..\mage8-windows\libbief.dll pamhyr\mage8\ +rem rubar +mkdir pamhyr\rubar +copy /y ..\adists-windows\rubarbe.exe pamhyr\rubar\ + rem adists mkdir pamhyr\adists copy /y ..\adists-windows\adists.exe pamhyr\adists\