From 075228aadc519ff710c91f96d7766fe6b0aefe78 Mon Sep 17 00:00:00 2001 From: JimMoen Date: Wed, 19 Oct 2022 10:20:31 +0800 Subject: [PATCH 1/2] chore: fix local actions path --- .github/workflows/build_packages.yaml | 3 +-- .github/workflows/release.yaml | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build_packages.yaml b/.github/workflows/build_packages.yaml index 322f1dbf4..b46eb9973 100644 --- a/.github/workflows/build_packages.yaml +++ b/.github/workflows/build_packages.yaml @@ -31,9 +31,8 @@ jobs: path: source fetch-depth: 0 - id: detect-profiles - uses: ./.github/actions/detect-profiles + uses: ./source/.github/actions/detect-profiles with: - path: source ci_git_token: ${{ secrets.CI_GIT_TOKEN }} - name: get_all_deps if: endsWith(github.repository, 'emqx') diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 71e5fe48a..5b438ffa0 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -18,8 +18,7 @@ jobs: path: source fetch-depth: 0 - id: detect-profiles - working-directory: source - uses: ./.github/actions/detect-profiles + uses: ./source/.github/actions/detect-profiles with: ci_git_token: ${{ secrets.CI_GIT_TOKEN }} From 34d73960e729a3217c5ea60d73ee0857793b0954 Mon Sep 17 00:00:00 2001 From: JimMoen Date: Wed, 19 Oct 2022 10:42:09 +0800 Subject: [PATCH 2/2] ci: fix macos erlang-otp cache hitting --- .github/actions/package-macos/action.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/actions/package-macos/action.yaml b/.github/actions/package-macos/action.yaml index 3efe0ef81..1a7e4fb9c 100644 --- a/.github/actions/package-macos/action.yaml +++ b/.github/actions/package-macos/action.yaml @@ -35,6 +35,8 @@ runs: with: path: ~/.kerl/${{ inputs.otp }} key: otp-install-${{ inputs.otp }}-${{ inputs.os }}-static-ssl-disable-hipe-disable-jit + restore-keys: | + otp-install-${{ inputs.otp }}-${{ inputs.os }} - name: build erlang if: steps.cache.outputs.cache-hit != 'true' shell: bash @@ -93,4 +95,5 @@ runs: exit 1 fi cd .. + # test with a spaces in path rm -rf "emqx home"