From 1224fc90ecd02f433f928541ecb7cd18362e54b9 Mon Sep 17 00:00:00 2001 From: Younes Khoudli Date: Sat, 8 Feb 2025 18:09:15 +0100 Subject: [PATCH 1/2] ci: reorder artifact upload order alphabetically Signed-off-by: Younes Khoudli --- .github/workflows/build.yml | 40 ++++++++++++++++++------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 92f2c884a12..48a6b766fde 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -105,54 +105,54 @@ jobs: echo "All retries failed, exiting." exit 1 + - name: Upload core artifact + uses: actions/upload-artifact@v4 + if: steps.bake-metadata.outputs.output_method == 'artifact' && contains(matrix.targets, 'core') + with: + name: core + path: osrd-core.tar - name: Upload core-build artifact uses: actions/upload-artifact@v4 if: steps.bake-metadata.outputs.output_method == 'artifact' && contains(matrix.targets, 'core-build') with: name: core-build path: osrd-core-build.tar - - name: Upload editoast-test artifact - uses: actions/upload-artifact@v4 - if: steps.bake-metadata.outputs.output_method == 'artifact' && contains(matrix.targets, 'editoast-test') - with: - name: editoast-test - path: osrd-editoast-test.tar - name: Upload editoast artifact uses: actions/upload-artifact@v4 if: steps.bake-metadata.outputs.output_method == 'artifact' && contains(matrix.targets, 'editoast') with: name: editoast path: osrd-editoast.tar - - name: Upload gateway-test artifact - uses: actions/upload-artifact@v4 - if: steps.bake-metadata.outputs.output_method == 'artifact' && contains(matrix.targets, 'gateway-test') - with: - name: gateway-test - path: osrd-gateway-test.tar - - name: Upload front-tests artifact + - name: Upload editoast-test artifact uses: actions/upload-artifact@v4 - if: steps.bake-metadata.outputs.output_method == 'artifact' && contains(matrix.targets, 'front-tests') + if: steps.bake-metadata.outputs.output_method == 'artifact' && contains(matrix.targets, 'editoast-test') with: - name: front-tests - path: osrd-front-tests.tar + name: editoast-test + path: osrd-editoast-test.tar - name: Upload front artifact uses: actions/upload-artifact@v4 if: steps.bake-metadata.outputs.output_method == 'artifact' && contains(matrix.targets, 'front-devel') with: name: front path: osrd-front.tar - - name: Upload core artifact + - name: Upload front-tests artifact uses: actions/upload-artifact@v4 - if: steps.bake-metadata.outputs.output_method == 'artifact' && contains(matrix.targets, 'core') + if: steps.bake-metadata.outputs.output_method == 'artifact' && contains(matrix.targets, 'front-tests') with: - name: core - path: osrd-core.tar + name: front-tests + path: osrd-front-tests.tar - name: Upload gateway-standalone artifact uses: actions/upload-artifact@v4 if: steps.bake-metadata.outputs.output_method == 'artifact' && contains(matrix.targets, 'gateway-standalone') with: name: gateway-standalone path: osrd-gateway-standalone.tar + - name: Upload gateway-test artifact + uses: actions/upload-artifact@v4 + if: steps.bake-metadata.outputs.output_method == 'artifact' && contains(matrix.targets, 'gateway-test') + with: + name: gateway-test + path: osrd-gateway-test.tar - name: Upload osrdyne artifact uses: actions/upload-artifact@v4 if: steps.bake-metadata.outputs.output_method == 'artifact' && contains(matrix.targets, 'osrdyne') From e280875d379def208e32a42ae2df6c7f4725e0b1 Mon Sep 17 00:00:00 2001 From: Younes Khoudli Date: Sat, 8 Feb 2025 18:12:05 +0100 Subject: [PATCH 2/2] ci: add gateway front to uploaded artifacts Otherwise end to end tests fail on PRs from forks. Signed-off-by: Younes Khoudli --- .github/workflows/build.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 48a6b766fde..30e29fa3276 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -141,6 +141,12 @@ jobs: with: name: front-tests path: osrd-front-tests.tar + - name: Upload gateway-front artifact + uses: actions/upload-artifact@v4 + if: steps.bake-metadata.outputs.output_method == 'artifact' && contains(matrix.targets, 'gateway-front') + with: + name: gateway-front + path: osrd-gateway-front.tar - name: Upload gateway-standalone artifact uses: actions/upload-artifact@v4 if: steps.bake-metadata.outputs.output_method == 'artifact' && contains(matrix.targets, 'gateway-standalone')