From afa4c7d341038fff926027f80e4c455248ad9f5a Mon Sep 17 00:00:00 2001 From: William Yang Date: Thu, 13 Jan 2022 11:41:45 +0100 Subject: [PATCH] ci(mac): cache otp install only only cache otp installation instead of the entire kerl dir to save cache spaces --- .github/workflows/build_packages.yaml | 9 +++++---- .github/workflows/build_slim_packages.yaml | 10 +++++----- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build_packages.yaml b/.github/workflows/build_packages.yaml index 3ab1f7086..e033832ed 100644 --- a/.github/workflows/build_packages.yaml +++ b/.github/workflows/build_packages.yaml @@ -126,8 +126,6 @@ jobs: path: source/_packages/${{ matrix.profile }}/. mac: - runs-on: macos-10.15 - needs: prepare strategy: @@ -137,6 +135,9 @@ jobs: - 23.2.7.2-emqx-3 exclude: - profile: emqx-edge + macos: + - macos-10.15 + runs-on: ${{ matrix.macos }} steps: - uses: actions/download-artifact@v2 @@ -154,8 +155,8 @@ jobs: - uses: actions/cache@v2 id: cache with: - path: ~/.kerl - key: erl${{ matrix.erl_otp }}-macos10.15 + path: ~/.kerl/${{ matrix.erl_otp }} + key: otp-install-${{ matrix.erl_otp }}-${{ matrix.macos }} - name: build erlang if: steps.cache.outputs.cache-hit != 'true' timeout-minutes: 60 diff --git a/.github/workflows/build_slim_packages.yaml b/.github/workflows/build_slim_packages.yaml index 85ca9b62f..c1c7ae62d 100644 --- a/.github/workflows/build_slim_packages.yaml +++ b/.github/workflows/build_slim_packages.yaml @@ -53,13 +53,13 @@ jobs: path: _packages/**/*.zip mac: - runs-on: macos-10.15 - strategy: matrix: erl_otp: - 23.2.7.2-emqx-3 - + macos: + - macos-11 + runs-on: ${{ matrix.macos }} steps: - uses: actions/checkout@v1 - name: prepare @@ -81,8 +81,8 @@ jobs: - uses: actions/cache@v2 id: cache with: - path: ~/.kerl - key: erl${{ matrix.erl_otp }}-macos10.15 + path: ~/.kerl/${{ matrix.erl_otp }} + key: otp-install-${{ matrix.erl_otp }}-${{ matrix.macos }} - name: build erlang if: steps.cache.outputs.cache-hit != 'true' timeout-minutes: 60