From f65ab9b48c40ce6cdda0f484401ddb8f05a31922 Mon Sep 17 00:00:00 2001 From: Ivan Dyachkov Date: Thu, 11 Jan 2024 12:57:47 +0100 Subject: [PATCH] ci: fix actions/upload-artifact v4 compatibility --- .github/workflows/build_packages.yaml | 8 +++++--- .github/workflows/build_slim_packages.yaml | 5 +++-- .github/workflows/run_conf_tests.yaml | 2 +- .github/workflows/run_jmeter_tests.yaml | 10 +++++----- .github/workflows/run_relup_tests.yaml | 6 +++--- .github/workflows/run_test_cases.yaml | 11 +++++++---- .github/workflows/spellcheck.yaml | 6 +++--- 7 files changed, 27 insertions(+), 21 deletions(-) diff --git a/.github/workflows/build_packages.yaml b/.github/workflows/build_packages.yaml index fad200a93..92926e924 100644 --- a/.github/workflows/build_packages.yaml +++ b/.github/workflows/build_packages.yaml @@ -99,9 +99,10 @@ jobs: - uses: actions/upload-artifact@c7d193f32edcb7bfad88892161225aeda64e9392 # v4.0.0 if: success() with: - name: ${{ matrix.profile }} + name: ${{ matrix.profile }}-${{ matrix.otp }}-${{ matrix.os }} path: _packages/${{ matrix.profile }}/ retention-days: 7 + compression-level: 0 linux: runs-on: [self-hosted, ephemeral, linux, "${{ matrix.arch }}"] @@ -195,9 +196,10 @@ jobs: fi - uses: actions/upload-artifact@c7d193f32edcb7bfad88892161225aeda64e9392 # v4.0.0 with: - name: ${{ matrix.profile }} + name: ${{ matrix.profile }}-${{ matrix.otp }}-${{ matrix.arch }}-${{ matrix.os }}-${{ matrix.with_elixir == 'yes' && 'elixir' || 'erlang' }} path: _packages/${{ matrix.profile }}/ retention-days: 7 + compression-level: 0 publish_artifacts: runs-on: ubuntu-latest @@ -213,7 +215,7 @@ jobs: steps: - uses: actions/download-artifact@6b208ae046db98c579e8a3aa621ab581ff575935 # v4.1.1 with: - name: ${{ matrix.profile }} + pattern: ${{ matrix.profile }}-* path: packages/${{ matrix.profile }} - name: install dos2unix run: sudo apt-get update -y && sudo apt install -y dos2unix diff --git a/.github/workflows/build_slim_packages.yaml b/.github/workflows/build_slim_packages.yaml index bce20191b..4b9ca76b9 100644 --- a/.github/workflows/build_slim_packages.yaml +++ b/.github/workflows/build_slim_packages.yaml @@ -90,12 +90,13 @@ jobs: ./scripts/pkg-tests.sh ${EMQX_NAME}-elixir-pkg - uses: actions/upload-artifact@c7d193f32edcb7bfad88892161225aeda64e9392 # v4.0.0 with: - name: "${{ matrix.profile[0] }}-${{ matrix.profile[1] }}-${{ matrix.profile[2] }}" + name: "${{ matrix.profile[0] }}-${{ matrix.profile[1] }}-${{ matrix.profile[2] }}-${{ matrix.profile[3] }}-${{ matrix.profile[4] }}" path: _packages/${{ matrix.profile[0] }}/* retention-days: 7 + compression-level: 0 - uses: actions/upload-artifact@c7d193f32edcb7bfad88892161225aeda64e9392 # v4.0.0 with: - name: "${{ matrix.profile[0] }}_schema_dump" + name: "${{ matrix.profile[0] }}-schema-dump-${{ matrix.profile[1] }}-${{ matrix.profile[2] }}-${{ matrix.profile[3] }}-${{ matrix.profile[4] }}" path: | scripts/spellcheck _build/docgen/${{ matrix.profile[0] }}/schema-en.json diff --git a/.github/workflows/run_conf_tests.yaml b/.github/workflows/run_conf_tests.yaml index 5580ad520..cac63910b 100644 --- a/.github/workflows/run_conf_tests.yaml +++ b/.github/workflows/run_conf_tests.yaml @@ -43,6 +43,6 @@ jobs: - uses: actions/upload-artifact@c7d193f32edcb7bfad88892161225aeda64e9392 # v4.0.0 if: failure() with: - name: logs-${{ matrix.profile }} + name: conftest-logs-${{ matrix.profile }} path: _build/${{ matrix.profile }}/rel/emqx/logs retention-days: 7 diff --git a/.github/workflows/run_jmeter_tests.yaml b/.github/workflows/run_jmeter_tests.yaml index e46a0b98e..86cbf220f 100644 --- a/.github/workflows/run_jmeter_tests.yaml +++ b/.github/workflows/run_jmeter_tests.yaml @@ -89,7 +89,7 @@ jobs: - uses: actions/upload-artifact@c7d193f32edcb7bfad88892161225aeda64e9392 # v4.0.0 if: always() with: - name: jmeter_logs + name: jmeter_logs-advanced_feat-${{ matrix.scripts_type }} path: ./jmeter_logs retention-days: 3 @@ -156,7 +156,7 @@ jobs: - uses: actions/upload-artifact@c7d193f32edcb7bfad88892161225aeda64e9392 # v4.0.0 if: always() with: - name: jmeter_logs + name: jmeter_logs-pgsql_authn_authz-${{ matrix.scripts_type }}_${{ matrix.pgsql_tag }} path: ./jmeter_logs retention-days: 3 @@ -216,7 +216,7 @@ jobs: - uses: actions/upload-artifact@c7d193f32edcb7bfad88892161225aeda64e9392 # v4.0.0 if: always() with: - name: jmeter_logs + name: jmeter_logs-mysql_authn_authz-${{ matrix.scripts_type }}_${{ matrix.mysql_tag }} path: ./jmeter_logs retention-days: 3 @@ -268,7 +268,7 @@ jobs: - uses: actions/upload-artifact@c7d193f32edcb7bfad88892161225aeda64e9392 # v4.0.0 if: always() with: - name: jmeter_logs + name: jmeter_logs-JWT_authn-${{ matrix.scripts_type }} path: ./jmeter_logs retention-days: 3 @@ -312,6 +312,6 @@ jobs: - uses: actions/upload-artifact@c7d193f32edcb7bfad88892161225aeda64e9392 # v4.0.0 if: always() with: - name: jmeter_logs + name: jmeter_logs-built_in_database_authn_authz-${{ matrix.scripts_type }} path: ./jmeter_logs retention-days: 3 diff --git a/.github/workflows/run_relup_tests.yaml b/.github/workflows/run_relup_tests.yaml index a93cee416..db8cef69d 100644 --- a/.github/workflows/run_relup_tests.yaml +++ b/.github/workflows/run_relup_tests.yaml @@ -48,7 +48,7 @@ jobs: - uses: actions/upload-artifact@c7d193f32edcb7bfad88892161225aeda64e9392 # v4.0.0 name: Upload built emqx and test scenario with: - name: emqx_built + name: relup_tests_emqx_built path: | _upgrade_base _packages @@ -91,7 +91,7 @@ jobs: - uses: actions/download-artifact@6b208ae046db98c579e8a3aa621ab581ff575935 # v4.1.1 name: Download built emqx and test scenario with: - name: emqx_built + name: relup_tests_emqx_built path: . - name: run relup test run: | @@ -115,7 +115,7 @@ jobs: name: Save debug data if: failure() with: - name: debug_data + name: relup_test_run_debug_data path: | lux_logs retention-days: 3 diff --git a/.github/workflows/run_test_cases.yaml b/.github/workflows/run_test_cases.yaml index 0df6fa0f0..8841c845b 100644 --- a/.github/workflows/run_test_cases.yaml +++ b/.github/workflows/run_test_cases.yaml @@ -66,7 +66,7 @@ jobs: - uses: actions/upload-artifact@c7d193f32edcb7bfad88892161225aeda64e9392 # v4.0.0 with: - name: coverdata + name: coverdata-${{ matrix.profile }}-${{ matrix.otp }} path: _build/test/cover retention-days: 7 @@ -110,7 +110,7 @@ jobs: run: ./scripts/ct/run.sh --ci --app ${{ matrix.app }} - uses: actions/upload-artifact@c7d193f32edcb7bfad88892161225aeda64e9392 # v4.0.0 with: - name: coverdata + name: coverdata-${{ matrix.profile }}-${{ matrix.prefix }}-${{ matrix.otp }}-sg${{ matrix.suitegroup }} path: _build/test/cover retention-days: 7 - name: compress logs @@ -121,6 +121,7 @@ jobs: with: name: logs-${{ matrix.profile }}-${{ matrix.prefix }}-${{ matrix.otp }}-sg${{ matrix.suitegroup }} path: logs.tar.gz + compression-level: 0 retention-days: 7 ct: @@ -156,7 +157,7 @@ jobs: make "${{ matrix.app }}-ct" - uses: actions/upload-artifact@c7d193f32edcb7bfad88892161225aeda64e9392 # v4.0.0 with: - name: coverdata + name: coverdata-${{ matrix.profile }}-${{ matrix.prefix }}-${{ matrix.otp }}-sg${{ matrix.suitegroup }} path: _build/test/cover if-no-files-found: warn # do not fail if no coverdata found retention-days: 7 @@ -168,6 +169,7 @@ jobs: with: name: logs-${{ matrix.profile }}-${{ matrix.prefix }}-${{ matrix.otp }}-sg${{ matrix.suitegroup }} path: logs.tar.gz + compression-level: 0 retention-days: 7 tests_passed: @@ -205,8 +207,9 @@ jobs: - uses: actions/download-artifact@6b208ae046db98c579e8a3aa621ab581ff575935 # v4.1.1 name: download coverdata with: - name: coverdata + pattern: coverdata-${{ matrix.profile }}-* path: _build/test/cover + merge-multiple: true - name: make cover env: diff --git a/.github/workflows/spellcheck.yaml b/.github/workflows/spellcheck.yaml index e03a89c50..0517cad41 100644 --- a/.github/workflows/spellcheck.yaml +++ b/.github/workflows/spellcheck.yaml @@ -21,8 +21,8 @@ jobs: steps: - uses: actions/download-artifact@6b208ae046db98c579e8a3aa621ab581ff575935 # v4.1.1 with: - name: "${{ matrix.profile }}_schema_dump" - path: /tmp/ + pattern: "${{ matrix.profile }}-schema-dump-*-x64" + merge-multiple: true - name: Run spellcheck run: | - bash /tmp/scripts/spellcheck/spellcheck.sh /tmp/_build/docgen/${{ matrix.profile }}/schema-en.json + bash scripts/spellcheck/spellcheck.sh _build/docgen/${{ matrix.profile }}/schema-en.json