From 3cc7fb150ad415b77368c449f3bb8e4b01244017 Mon Sep 17 00:00:00 2001 From: Vincent Payet Date: Fri, 12 Jul 2024 14:02:37 +0200 Subject: [PATCH 01/25] Remove set-output --- .github/workflows/generate-reference.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/generate-reference.yml b/.github/workflows/generate-reference.yml index 3a02603..97782e7 100644 --- a/.github/workflows/generate-reference.yml +++ b/.github/workflows/generate-reference.yml @@ -52,7 +52,7 @@ jobs: id: read_batches run: | BATCHES=$(printf "\"%s\"," $(cat study-batches.txt) | sed "s/^/[/;s/,$/]/") - echo "::set-output name=batches::$BATCHES" + echo "batches::${{ BATCHES }}" >> $GITHUB_ENV - name: Upload study-batches.txt uses: actions/upload-release-asset@v1 From c62e28ed86c1929b623cce264c4969f203b83000 Mon Sep 17 00:00:00 2001 From: Vincent Payet Date: Fri, 12 Jul 2024 14:48:27 +0200 Subject: [PATCH 02/25] Env + var --- .github/workflows/generate-reference.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/generate-reference.yml b/.github/workflows/generate-reference.yml index 97782e7..f7e7885 100644 --- a/.github/workflows/generate-reference.yml +++ b/.github/workflows/generate-reference.yml @@ -52,7 +52,7 @@ jobs: id: read_batches run: | BATCHES=$(printf "\"%s\"," $(cat study-batches.txt) | sed "s/^/[/;s/,$/]/") - echo "batches::${{ BATCHES }}" >> $GITHUB_ENV + echo "batches::${{ $BATCHES }}" >> $GITHUB_ENV - name: Upload study-batches.txt uses: actions/upload-release-asset@v1 @@ -70,7 +70,7 @@ jobs: strategy: fail-fast: false matrix: - batch: ${{ fromJson(needs.matrix.outputs.batches) }} + batch: ${{ fromJson(env.batches) }} os: [ubuntu-20.04, windows-2022] steps: From 212a744edbe0a950dcde47ddb18c6b3a63d855ad Mon Sep 17 00:00:00 2001 From: Vincent Payet Date: Fri, 12 Jul 2024 15:30:35 +0200 Subject: [PATCH 03/25] try fix --- .github/workflows/generate-reference.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/generate-reference.yml b/.github/workflows/generate-reference.yml index f7e7885..0a8b1e4 100644 --- a/.github/workflows/generate-reference.yml +++ b/.github/workflows/generate-reference.yml @@ -52,7 +52,7 @@ jobs: id: read_batches run: | BATCHES=$(printf "\"%s\"," $(cat study-batches.txt) | sed "s/^/[/;s/,$/]/") - echo "batches::${{ $BATCHES }}" >> $GITHUB_ENV + echo "batches::$BATCHES" >> $GITHUB_ENV - name: Upload study-batches.txt uses: actions/upload-release-asset@v1 From 5471c88503cfc584004aa660fb2416cf55b41121 Mon Sep 17 00:00:00 2001 From: Vincent Payet Date: Fri, 12 Jul 2024 15:41:00 +0200 Subject: [PATCH 04/25] try fix --- .github/workflows/generate-reference.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/generate-reference.yml b/.github/workflows/generate-reference.yml index 0a8b1e4..2c3e83d 100644 --- a/.github/workflows/generate-reference.yml +++ b/.github/workflows/generate-reference.yml @@ -70,7 +70,7 @@ jobs: strategy: fail-fast: false matrix: - batch: ${{ fromJson(env.batches) }} + batch: ${{ fromJson($env.batches) }} os: [ubuntu-20.04, windows-2022] steps: From 8a2d17e8d4e3b32d1967c4de3876d1036ffbd4de Mon Sep 17 00:00:00 2001 From: Vincent Payet Date: Fri, 12 Jul 2024 16:01:23 +0200 Subject: [PATCH 05/25] try fix --- .github/workflows/generate-reference.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/generate-reference.yml b/.github/workflows/generate-reference.yml index 2c3e83d..aae262d 100644 --- a/.github/workflows/generate-reference.yml +++ b/.github/workflows/generate-reference.yml @@ -70,7 +70,7 @@ jobs: strategy: fail-fast: false matrix: - batch: ${{ fromJson($env.batches) }} + batch: ${{ env.batches }} os: [ubuntu-20.04, windows-2022] steps: From 8468e3c42a8a3843f28ba1247c9be05dc403781d Mon Sep 17 00:00:00 2001 From: Vincent Payet Date: Fri, 12 Jul 2024 16:04:46 +0200 Subject: [PATCH 06/25] try fix --- .github/workflows/generate-reference.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/generate-reference.yml b/.github/workflows/generate-reference.yml index aae262d..6109b02 100644 --- a/.github/workflows/generate-reference.yml +++ b/.github/workflows/generate-reference.yml @@ -52,7 +52,7 @@ jobs: id: read_batches run: | BATCHES=$(printf "\"%s\"," $(cat study-batches.txt) | sed "s/^/[/;s/,$/]/") - echo "batches::$BATCHES" >> $GITHUB_ENV + echo "batches::$BATCHES" >> $GITHUB_OUTPUT - name: Upload study-batches.txt uses: actions/upload-release-asset@v1 @@ -70,7 +70,7 @@ jobs: strategy: fail-fast: false matrix: - batch: ${{ env.batches }} + batch: ${{ fromJson(needs.matrix.outputs.batches) }} os: [ubuntu-20.04, windows-2022] steps: From 39319cf6a3cb9ff875824a99c2480efb7db7a3d5 Mon Sep 17 00:00:00 2001 From: Vincent Payet Date: Fri, 12 Jul 2024 16:22:39 +0200 Subject: [PATCH 07/25] fix varf --- .github/workflows/generate-reference.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/generate-reference.yml b/.github/workflows/generate-reference.yml index 6109b02..d37925e 100644 --- a/.github/workflows/generate-reference.yml +++ b/.github/workflows/generate-reference.yml @@ -52,7 +52,7 @@ jobs: id: read_batches run: | BATCHES=$(printf "\"%s\"," $(cat study-batches.txt) | sed "s/^/[/;s/,$/]/") - echo "batches::$BATCHES" >> $GITHUB_OUTPUT + echo "batches=$BATCHES" >> $GITHUB_OUTPUT - name: Upload study-batches.txt uses: actions/upload-release-asset@v1 From 53807d2af6bf6ae19b6cc6bcc4d6e2f6ba8ebe8b Mon Sep 17 00:00:00 2001 From: Vincent Payet Date: Tue, 16 Jul 2024 15:51:13 +0200 Subject: [PATCH 08/25] use gh tool to upload study batches --- .github/workflows/generate-reference.yml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/.github/workflows/generate-reference.yml b/.github/workflows/generate-reference.yml index d37925e..68ee522 100644 --- a/.github/workflows/generate-reference.yml +++ b/.github/workflows/generate-reference.yml @@ -55,14 +55,11 @@ jobs: echo "batches=$BATCHES" >> $GITHUB_OUTPUT - name: Upload study-batches.txt - uses: actions/upload-release-asset@v1 env: GITHUB_TOKEN: ${{ github.token }} - with: - upload_url: ${{ needs.release.outputs.url }} - asset_path: study-batches.txt - asset_name: study-batches.txt - asset_content_type: application/octet-stream + tag: ${{ github.event.inputs.release_tag }} + run: | + gh release upload "$tag" study-batches.txt generation: runs-on: ${{ matrix.os }} From 4a739a9e142e387b3b8a7e1770dfaad6dae3f6e2 Mon Sep 17 00:00:00 2001 From: Vincent Payet Date: Tue, 16 Jul 2024 15:52:31 +0200 Subject: [PATCH 09/25] correct tag --- .github/workflows/generate-reference.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/generate-reference.yml b/.github/workflows/generate-reference.yml index 68ee522..17c3a1a 100644 --- a/.github/workflows/generate-reference.yml +++ b/.github/workflows/generate-reference.yml @@ -57,7 +57,7 @@ jobs: - name: Upload study-batches.txt env: GITHUB_TOKEN: ${{ github.token }} - tag: ${{ github.event.inputs.release_tag }} + tag: ${{ github.event.inputs.antares_tag }} run: | gh release upload "$tag" study-batches.txt From 1ae4249099a18425e3584ab7ed0990fd795255c7 Mon Sep 17 00:00:00 2001 From: Vincent Payet Date: Tue, 16 Jul 2024 15:54:05 +0200 Subject: [PATCH 10/25] default value for inputs --- .github/workflows/generate-reference.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/generate-reference.yml b/.github/workflows/generate-reference.yml index 17c3a1a..960cf10 100644 --- a/.github/workflows/generate-reference.yml +++ b/.github/workflows/generate-reference.yml @@ -12,11 +12,11 @@ on: required: true antares_tag: description: "Antares_Simulator solver tag" - default: v8.0.3 + default: v9.0.0 required: true antares_tests_tag: description: "Antares_Simulator_Tests_NR" - default: v8.0.0 + default: v9.0.0 required: true jobs: From 77d538e8de73a70a366600b7f1b5641591906416 Mon Sep 17 00:00:00 2001 From: Vincent Payet Date: Tue, 16 Jul 2024 15:56:40 +0200 Subject: [PATCH 11/25] checkout --- .github/workflows/generate-reference.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/generate-reference.yml b/.github/workflows/generate-reference.yml index 960cf10..afde8a1 100644 --- a/.github/workflows/generate-reference.yml +++ b/.github/workflows/generate-reference.yml @@ -44,6 +44,9 @@ jobs: batches: ${{ steps.read_batches.outputs.batches }} steps: + - name: Checkout SimTest + uses: actions/checkout@v4 + - name: Download study-batches.txt run: | wget https://github.com/AntaresSimulatorTeam/Antares_Simulator_Tests_NR/releases/download/${{ github.event.inputs.antares_tests_tag }}/study-batches.txt @@ -72,7 +75,7 @@ jobs: steps: - name: Checkout SimTest - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Pre-requisites (Windows) if: ${{ startsWith(matrix.os, 'windows') }} From cbeec39aa5a1cf5aaa0a220bab5c40ca2248eef8 Mon Sep 17 00:00:00 2001 From: Vincent Payet Date: Wed, 17 Jul 2024 11:16:07 +0200 Subject: [PATCH 12/25] Create release with gh --- .github/workflows/generate-reference.yml | 33 ++++++++++++------------ 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/.github/workflows/generate-reference.yml b/.github/workflows/generate-reference.yml index afde8a1..1558225 100644 --- a/.github/workflows/generate-reference.yml +++ b/.github/workflows/generate-reference.yml @@ -21,23 +21,6 @@ on: jobs: release: - runs-on: ubuntu-latest - outputs: - url: ${{ steps.create_release.outputs.upload_url }} - steps: - - name: Release creation - uses: actions/create-release@v1 - id: create_release - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - tag_name: ${{ github.event.inputs.release_tag }} - release_name: ${{ github.event.inputs.release_name }} - body: | - Antares_Simulator : ${{ github.event.inputs.antares_tag }} - Antares_Simulator_Tests_NR : ${{ github.event.inputs.antares_tests_tag }} - - matrix: runs-on: ubuntu-latest needs: release outputs: @@ -47,6 +30,22 @@ jobs: - name: Checkout SimTest uses: actions/checkout@v4 + - name: Create release + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + tag: ${{ github.event.inputs.release_tag }} + title: ${{ github.event.inputs.release_name }} + antares_tag: ${{ github.event.inputs.antares_tag }} + antares_tests_tag: ${{ github.event.inputs.antares_tests_tag }} + run: | + gh release create "$tag" \ + --repo="$GITHUB_REPOSITORY" \ + --title="$title" \ + --target="$target_branch" \ + --notes="Antares_Simulator: $antares_tag" + --notes="Antares_Simulator_Tests_NR: $antares_tests_tag" + + - name: Download study-batches.txt run: | wget https://github.com/AntaresSimulatorTeam/Antares_Simulator_Tests_NR/releases/download/${{ github.event.inputs.antares_tests_tag }}/study-batches.txt From c2da30102d3786a5aaeb16f12a42568566e88465 Mon Sep 17 00:00:00 2001 From: Vincent Payet Date: Wed, 17 Jul 2024 11:22:40 +0200 Subject: [PATCH 13/25] Remove needs in workflow --- .github/workflows/generate-reference.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/generate-reference.yml b/.github/workflows/generate-reference.yml index 1558225..9762db1 100644 --- a/.github/workflows/generate-reference.yml +++ b/.github/workflows/generate-reference.yml @@ -22,7 +22,6 @@ on: jobs: release: runs-on: ubuntu-latest - needs: release outputs: batches: ${{ steps.read_batches.outputs.batches }} @@ -45,7 +44,6 @@ jobs: --notes="Antares_Simulator: $antares_tag" --notes="Antares_Simulator_Tests_NR: $antares_tests_tag" - - name: Download study-batches.txt run: | wget https://github.com/AntaresSimulatorTeam/Antares_Simulator_Tests_NR/releases/download/${{ github.event.inputs.antares_tests_tag }}/study-batches.txt @@ -65,7 +63,7 @@ jobs: generation: runs-on: ${{ matrix.os }} - needs: [release, matrix] + needs: [release] strategy: fail-fast: false matrix: From f7966181f1b409d55f98ab0248a9b5fff5f8cdfe Mon Sep 17 00:00:00 2001 From: Vincent Payet Date: Wed, 17 Jul 2024 11:30:04 +0200 Subject: [PATCH 14/25] remove 2nd --notes --- .github/workflows/generate-reference.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/generate-reference.yml b/.github/workflows/generate-reference.yml index 9762db1..42a73af 100644 --- a/.github/workflows/generate-reference.yml +++ b/.github/workflows/generate-reference.yml @@ -41,8 +41,7 @@ jobs: --repo="$GITHUB_REPOSITORY" \ --title="$title" \ --target="$target_branch" \ - --notes="Antares_Simulator: $antares_tag" - --notes="Antares_Simulator_Tests_NR: $antares_tests_tag" + --notes="Antares_Simulator: $antares_tag \nAntares_Simulator_Tests_NR: $antares_tests_tag" - name: Download study-batches.txt run: | From 04cc64e59b72e0cc510eae4144060bf31a243909 Mon Sep 17 00:00:00 2001 From: Vincent Payet Date: Wed, 17 Jul 2024 11:32:19 +0200 Subject: [PATCH 15/25] needs --- .github/workflows/generate-reference.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/generate-reference.yml b/.github/workflows/generate-reference.yml index 42a73af..3e2f6f7 100644 --- a/.github/workflows/generate-reference.yml +++ b/.github/workflows/generate-reference.yml @@ -62,11 +62,11 @@ jobs: generation: runs-on: ${{ matrix.os }} - needs: [release] + needs: release strategy: fail-fast: false matrix: - batch: ${{ fromJson(needs.matrix.outputs.batches) }} + batch: ${{ fromJson(needs.release.outputs.batches) }} os: [ubuntu-20.04, windows-2022] steps: From cde2e269d4e855fc6c190231c176b69bcea14a5b Mon Sep 17 00:00:00 2001 From: Vincent Payet Date: Wed, 17 Jul 2024 11:34:11 +0200 Subject: [PATCH 16/25] use r also --- .github/workflows/generate-reference.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/generate-reference.yml b/.github/workflows/generate-reference.yml index 3e2f6f7..c0b7832 100644 --- a/.github/workflows/generate-reference.yml +++ b/.github/workflows/generate-reference.yml @@ -41,7 +41,7 @@ jobs: --repo="$GITHUB_REPOSITORY" \ --title="$title" \ --target="$target_branch" \ - --notes="Antares_Simulator: $antares_tag \nAntares_Simulator_Tests_NR: $antares_tests_tag" + --notes="Antares_Simulator: $antares_tag \r\nAntares_Simulator_Tests_NR: $antares_tests_tag" - name: Download study-batches.txt run: | From 2bb1d35001a0f9f5e1197e2d643a986e10b6ddde Mon Sep 17 00:00:00 2001 From: Vincent Payet Date: Wed, 17 Jul 2024 11:49:55 +0200 Subject: [PATCH 17/25] Upload zip with gh release upload --- .github/workflows/generate-reference.yml | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/.github/workflows/generate-reference.yml b/.github/workflows/generate-reference.yml index c0b7832..7edd318 100644 --- a/.github/workflows/generate-reference.yml +++ b/.github/workflows/generate-reference.yml @@ -130,15 +130,9 @@ jobs: echo Antares_Simulator_Tests_NR ${{ github.event.inputs.antares_tests_tag }} >> ${{ matrix.batch }}/version.txt echo SimTest ${{ github.event.inputs.release_tag }} >> ${{ matrix.batch }}/version.txt - - name: zip results - run: zip -q -r results.zip ${{ matrix.batch }} - - name: Upload .zip - uses: actions/upload-release-asset@v1 env: GITHUB_TOKEN: ${{ github.token }} - with: - upload_url: ${{ needs.release.outputs.url }} - asset_path: results.zip - asset_name: ${{ matrix.batch }}-${{ matrix.os }}.zip - asset_content_type: application/octet-stream + tag: ${{ github.event.inputs.antares_tag }} + run: | + gh release upload "$tag" study-batches.txt#${{ matrix.batch }}-${{ matrix.os }}.zip From 97af0c680bf0258508b6d881059d3d064f329617 Mon Sep 17 00:00:00 2001 From: Vincent Payet Date: Wed, 17 Jul 2024 11:50:49 +0200 Subject: [PATCH 18/25] break line --- .github/workflows/generate-reference.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/generate-reference.yml b/.github/workflows/generate-reference.yml index 7edd318..2356d3c 100644 --- a/.github/workflows/generate-reference.yml +++ b/.github/workflows/generate-reference.yml @@ -41,7 +41,8 @@ jobs: --repo="$GITHUB_REPOSITORY" \ --title="$title" \ --target="$target_branch" \ - --notes="Antares_Simulator: $antares_tag \r\nAntares_Simulator_Tests_NR: $antares_tests_tag" + --notes="Antares_Simulator: $antares_tag \ + Antares_Simulator_Tests_NR: $antares_tests_tag" - name: Download study-batches.txt run: | From 6f2b6b3bddf0d436dc0b0f38efd273abf9ce6ede Mon Sep 17 00:00:00 2001 From: Vincent Payet Date: Wed, 17 Jul 2024 11:57:21 +0200 Subject: [PATCH 19/25] results.zip --- .github/workflows/generate-reference.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/generate-reference.yml b/.github/workflows/generate-reference.yml index 2356d3c..a342e87 100644 --- a/.github/workflows/generate-reference.yml +++ b/.github/workflows/generate-reference.yml @@ -41,7 +41,7 @@ jobs: --repo="$GITHUB_REPOSITORY" \ --title="$title" \ --target="$target_branch" \ - --notes="Antares_Simulator: $antares_tag \ + --notes="Antares_Simulator: $antares_tag Antares_Simulator_Tests_NR: $antares_tests_tag" - name: Download study-batches.txt @@ -136,4 +136,4 @@ jobs: GITHUB_TOKEN: ${{ github.token }} tag: ${{ github.event.inputs.antares_tag }} run: | - gh release upload "$tag" study-batches.txt#${{ matrix.batch }}-${{ matrix.os }}.zip + gh release upload "$tag" results.zip#${{ matrix.batch }}-${{ matrix.os }}.zip From d9940114b5fd2dbeff740f209f4891a63edb0602 Mon Sep 17 00:00:00 2001 From: Vincent Payet Date: Wed, 17 Jul 2024 12:02:32 +0200 Subject: [PATCH 20/25] zip results --- .github/workflows/generate-reference.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/generate-reference.yml b/.github/workflows/generate-reference.yml index a342e87..7951948 100644 --- a/.github/workflows/generate-reference.yml +++ b/.github/workflows/generate-reference.yml @@ -131,6 +131,9 @@ jobs: echo Antares_Simulator_Tests_NR ${{ github.event.inputs.antares_tests_tag }} >> ${{ matrix.batch }}/version.txt echo SimTest ${{ github.event.inputs.release_tag }} >> ${{ matrix.batch }}/version.txt + - name: zip results + run: zip -q -r results.zip ${{ matrix.batch }} + - name: Upload .zip env: GITHUB_TOKEN: ${{ github.token }} From 0b7ef6ded1b53a2a4c94bb746b62aebd60515d75 Mon Sep 17 00:00:00 2001 From: Vincent Payet Date: Wed, 17 Jul 2024 12:04:34 +0200 Subject: [PATCH 21/25] fix zip indent --- .github/workflows/generate-reference.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/generate-reference.yml b/.github/workflows/generate-reference.yml index 7951948..7dc7143 100644 --- a/.github/workflows/generate-reference.yml +++ b/.github/workflows/generate-reference.yml @@ -131,7 +131,7 @@ jobs: echo Antares_Simulator_Tests_NR ${{ github.event.inputs.antares_tests_tag }} >> ${{ matrix.batch }}/version.txt echo SimTest ${{ github.event.inputs.release_tag }} >> ${{ matrix.batch }}/version.txt - - name: zip results + - name: zip results run: zip -q -r results.zip ${{ matrix.batch }} - name: Upload .zip From 34c44e11ac47dcdd46924403facbf6284edc991f Mon Sep 17 00:00:00 2001 From: Vincent Payet Date: Wed, 17 Jul 2024 12:11:40 +0200 Subject: [PATCH 22/25] correct tag --- .github/workflows/generate-reference.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/generate-reference.yml b/.github/workflows/generate-reference.yml index 7dc7143..fa6e8a3 100644 --- a/.github/workflows/generate-reference.yml +++ b/.github/workflows/generate-reference.yml @@ -57,7 +57,7 @@ jobs: - name: Upload study-batches.txt env: GITHUB_TOKEN: ${{ github.token }} - tag: ${{ github.event.inputs.antares_tag }} + tag: ${{ github.event.inputs.release_tag }} run: | gh release upload "$tag" study-batches.txt @@ -137,6 +137,6 @@ jobs: - name: Upload .zip env: GITHUB_TOKEN: ${{ github.token }} - tag: ${{ github.event.inputs.antares_tag }} + tag: ${{ github.event.inputs.release_tag }} run: | gh release upload "$tag" results.zip#${{ matrix.batch }}-${{ matrix.os }}.zip From c0b30b0dccaaea53fe86b8a4f9c300f67abc603b Mon Sep 17 00:00:00 2001 From: Vincent Payet Date: Wed, 17 Jul 2024 12:16:07 +0200 Subject: [PATCH 23/25] name --- .github/workflows/generate-reference.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/generate-reference.yml b/.github/workflows/generate-reference.yml index fa6e8a3..6984aad 100644 --- a/.github/workflows/generate-reference.yml +++ b/.github/workflows/generate-reference.yml @@ -132,11 +132,11 @@ jobs: echo SimTest ${{ github.event.inputs.release_tag }} >> ${{ matrix.batch }}/version.txt - name: zip results - run: zip -q -r results.zip ${{ matrix.batch }} + run: zip -q -r {{ matrix.batch }}-${{ matrix.os }}.zip ${{ matrix.batch }} - name: Upload .zip env: GITHUB_TOKEN: ${{ github.token }} tag: ${{ github.event.inputs.release_tag }} run: | - gh release upload "$tag" results.zip#${{ matrix.batch }}-${{ matrix.os }}.zip + gh release upload "$tag" ${{ matrix.batch }}-${{ matrix.os }}.zip From e4fe60b6555bdb07de837e4cff03d4fea7efbdf4 Mon Sep 17 00:00:00 2001 From: Vincent Payet Date: Wed, 17 Jul 2024 12:25:20 +0200 Subject: [PATCH 24/25] correct var --- .github/workflows/generate-reference.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/generate-reference.yml b/.github/workflows/generate-reference.yml index 6984aad..dbc27fa 100644 --- a/.github/workflows/generate-reference.yml +++ b/.github/workflows/generate-reference.yml @@ -127,12 +127,11 @@ jobs: - name: Write tags to file shell: bash run: | - echo Antares_Simulator ${{ github.event.inputs.antares_tag }} >> ${{ matrix.batch }}/version.txt - echo Antares_Simulator_Tests_NR ${{ github.event.inputs.antares_tests_tag }} >> ${{ matrix.batch }}/version.txt + echo Antares_Simulator ${{ github.event.inputs.antares_tag }} >> ${{ matrix.batch }}/version.txt echo Antares_Simulator_Tests_NR ${{ github.event.inputs.antares_tests_tag }} >> ${{ matrix.batch }}/version.txt echo SimTest ${{ github.event.inputs.release_tag }} >> ${{ matrix.batch }}/version.txt - name: zip results - run: zip -q -r {{ matrix.batch }}-${{ matrix.os }}.zip ${{ matrix.batch }} + run: zip -q -r ${{ matrix.batch }}-${{ matrix.os }}.zip ${{ matrix.batch }} - name: Upload .zip env: From e19be858a462e02738129e89a1d93d4801f77339 Mon Sep 17 00:00:00 2001 From: Vincent Payet Date: Wed, 17 Jul 2024 12:39:13 +0200 Subject: [PATCH 25/25] bash shell for windows --- .github/workflows/generate-reference.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/generate-reference.yml b/.github/workflows/generate-reference.yml index dbc27fa..f60c3d6 100644 --- a/.github/workflows/generate-reference.yml +++ b/.github/workflows/generate-reference.yml @@ -137,5 +137,7 @@ jobs: env: GITHUB_TOKEN: ${{ github.token }} tag: ${{ github.event.inputs.release_tag }} + shell: bash run: | gh release upload "$tag" ${{ matrix.batch }}-${{ matrix.os }}.zip +