Merge pull request #290 from id/0531-ci-fix-release-workflow

ci: fix release workflow
emqx · May 31, 2024 · 023b3b6 · 023b3b6
2 parents 4844f75 + 802251b
commit 023b3b6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -73,7 +73,7 @@ jobs:
         uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
         if: failure()
         with:
-          name: mac-ct-logs
+          name: mac-ct-logs-${{ matrix.os }}-${{ matrix.otp }}
           path: _build/test/logs
           retention-days: 1
 
@@ -163,7 +163,7 @@ jobs:
         uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
         if: failure()
         with:
-          name: linux-ct-logs
+          name: linux-ct-logs-${{ matrix.otp }}-${{ matrix.openssl }}-${{ matrix.build_type }}-${{ matrix.logging }}-${{ matrix.arch }}
           path: _build/test/
           retention-days: 1
 

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -42,6 +42,7 @@ jobs:
         run: |
           export HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1
           brew install erlang@${{ matrix.otp }}
+          echo "$(brew --prefix erlang@${{ matrix.otp }})/bin" >> $GITHUB_PATH
       - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
         with:
           fetch-depth: 0
@@ -53,7 +54,7 @@ jobs:
           QUIC_TLS: ${{ matrix.openssl }}
         run: |
           wget https://s3.amazonaws.com/rebar3/rebar3 && chmod +x rebar3
-          export PATH="$PWD:/usr/local/opt/erlang@${{ matrix.otp }}/bin:$PATH"
+          sudo mv rebar3 /usr/local/bin/ && sudo chmod +x /usr/local/bin/rebar3
           erl -eval 'erlang:display(erlang:system_info(system_version)),halt()'
           export QUIC_TLS
           BUILD_RELEASE=1 make