Merge pull request #550 from AntaresSimulatorTeam/ci/fix_artifact_upl…

…oad_error Fix concurrent upload of artifact
AntaresSimulatorTeam · Oct 13, 2022 · 908288c · 908288c
2 parents 9c73980 + 722cfa5
commit 908288c
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 16 deletions.
diff --git a/.github/workflows/centos7-system.yml b/.github/workflows/centos7-system.yml
@@ -170,31 +170,32 @@ jobs:
           export PATH=/usr/lib64/openmpi/bin:$PATH
           cmake3 --build _build --config Release -j2 --target install
 
+      - name: set name variables
+        id: single_file_name
+        shell: bash
+        run: |
+          [[ ${{ matrix.xprs }} == "XPRESS-ON" ]] && XPRESS_VALUE="ON" || XPRESS_VALUE="OFF" 
+          XPRS=${{ XPRESS_VALUE }}
+          [ $XPRS == "ON" ] && WITH_XPRS="-xpress" || WITH_XPRS=""
+          VERSION=${{steps.antares-xpansion-version.outputs.prop}}${WITH_XPRS}
+          echo "::set-output name=version::$VERSION"
+          echo "VERSION_WITH_XPRESS=$VERSION"
+          echo "VERSION_WITH_XPRESS=$VERSION" >> $GITHUB_ENV
+
       - name: .tar.gz creation
         run: |
           cd _build
-          cpack3 -G TGZ
+          cpack3 -G TGZ -P antaresXpansion-${{env.VERSION_WITH_XPRESS}}-CentOS-7.9.2009.tar.gz
           export TGZ_NAME=$(ls *.tar.gz)
           echo "TGZ_NAME=$TGZ_NAME" >> $GITHUB_ENV
 
       - name: Installer .rpm creation
         run: |
           cd _build
-          cpack3 -G RPM
+          cpack3 -G RPM -P antaresXpansion-${{env.VERSION_WITH_XPRESS}}-CentOS-7.9.2009.rpm
           export RPM_NAME=$(ls *.rpm)
           echo "RPM_NAME=$RPM_NAME" >> $GITHUB_ENV
 
-      - name: set name variables
-        id: single_file_name
-        shell: bash
-        run: |
-          XPRS=${{ matrix.xprs }}
-          [ $XPRS == "ON" ] && WITH_XPRS="-xpress" || WITH_XPRS=""
-          VERSION=${{steps.antares-xpansion-version.outputs.prop}}${WITH_XPRS}
-          echo "::set-output name=version::$VERSION"
-          echo "VERSION_WITH_XPRESS=$VERSION"
-          echo "VERSION_WITH_XPRESS=$VERSION" >> $GITHUB_ENV
-
       - id: create-single-file
         name: Single file .tar.gz creation
         uses: ./.github/workflows/single-file-creation-tgz

diff --git a/.github/workflows/ubuntu-system.yml b/.github/workflows/ubuntu-system.yml
@@ -161,7 +161,7 @@ jobs:
         shell: bash
         run: |
           [[ ${{ matrix.xprs }} == "XPRESS-ON" ]] && XPRESS_VALUE="ON" || XPRESS_VALUE="OFF" 
-          XPRS=${{ env.XPRESS_VALUE }}
+          XPRS=${{ XPRESS_VALUE }}
           [ $XPRS == "ON" ] && WITH_XPRS="-xpress" || WITH_XPRS=""
           VERSION=${{steps.antares-xpansion-version.outputs.prop}}${WITH_XPRS}
           echo "::set-output name=version::$VERSION"
@@ -177,14 +177,14 @@ jobs:
       - name: Installer .tar.gz creation
         run: |
           cd _build
-          cpack -G TGZ
+          cpack -G TGZ -P antaresXpansion-${{env.VERSION_WITH_XPRESS}}-${{ matrix.os }}.tar.gz
           export TGZ_NAME=$(ls *.tar.gz)
           echo "TGZ_NAME=$TGZ_NAME" >> $GITHUB_ENV
 
       - name: Installer .deb creation
         run: |
           cd _build
-          cpack -G DEB
+          cpack -G DEB -P antaresXpansion-${{env.VERSION_WITH_XPRESS}}-${{ matrix.os }}.deb
           export DEB_NAME=$(ls *.deb)
           echo "DEB_NAME=$DEB_NAME" >> $GITHUB_ENV