From 188f1b52c70a1463382b15c01917a6b5c2ceb296 Mon Sep 17 00:00:00 2001
From: Zaiming Shi <zmstone@gmail.com>
Date: Mon, 22 Nov 2021 08:23:40 +0100
Subject: [PATCH] ci: rename action matrix dimention name opt_vsn to opt

---
 .github/workflows/build_packages.yaml      |  1 -
 .github/workflows/build_slim_packages.yaml | 16 ++++++++--------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/build_packages.yaml b/.github/workflows/build_packages.yaml
index 512c8e3e8..f8f4eb9dc 100644
--- a/.github/workflows/build_packages.yaml
+++ b/.github/workflows/build_packages.yaml
@@ -40,7 +40,6 @@ jobs:
           old_vsns="$(git tag -l "v$pre_vsn.[0-9]" | xargs echo -n | sed "s/v$vsn//")"
           echo "::set-output name=old_vsns::$old_vsns"
       - name: get_all_deps
-        if: endsWith(github.repository, 'emqx')
         run: |
           make -C source deps-all
           zip -ryq source.zip source/* source/.[^.]*
diff --git a/.github/workflows/build_slim_packages.yaml b/.github/workflows/build_slim_packages.yaml
index 85fe1f6b0..46eb7aef7 100644
--- a/.github/workflows/build_slim_packages.yaml
+++ b/.github/workflows/build_slim_packages.yaml
@@ -23,13 +23,13 @@ jobs:
         - emqx-edge
         - emqx
         - emqx-ee
-        otp_vsn:
+        otp:
         - 24.1.5-2
         os:
         - ubuntu20.04
         - centos7
 
-    container: "ghcr.io/emqx/emqx-builder/5.0-2:${{ matrix.otp_vsn }}-${{ matrix.os }}"
+    container: "ghcr.io/emqx/emqx-builder/5.0-2:${{ matrix.otp }}-${{ matrix.os }}"
 
     steps:
     - uses: actions/checkout@v1
@@ -43,7 +43,7 @@ jobs:
         EMQX_NAME=${{ matrix.profile }} .ci/build_packages/tests.sh
     - uses: actions/upload-artifact@v2
       with:
-        name: ${{ matrix.profile}}-${{ matrix.otp_vsn }}-${{ matrix.os }}
+        name: ${{ matrix.profile}}-${{ matrix.otp }}-${{ matrix.os }}
         path: _packages/**/*.zip
 
   mac:
@@ -54,7 +54,7 @@ jobs:
         profile:
         - emqx
         - emqx-ee
-        otp_vsn:
+        otp:
         - 24.1.5-2
         macos:
         - macos-11
@@ -74,7 +74,7 @@ jobs:
       id: cache
       with:
         path: ~/.kerl
-        key: otp-${{ matrix.otp_vsn }}-${{ matrix.macos }}
+        key: otp-${{ matrix.otp }}-${{ matrix.macos }}
     - name: build erlang
       if: steps.cache.outputs.cache-hit != 'true'
       timeout-minutes: 60
@@ -83,11 +83,11 @@ jobs:
         OTP_GITHUB_URL: https://github.com/emqx/otp
       run: |
         kerl update releases
-        kerl build ${{ matrix.otp_vsn }}
-        kerl install ${{ matrix.otp_vsn }} $HOME/.kerl/${{ matrix.otp_vsn }}
+        kerl build ${{ matrix.otp }}
+        kerl install ${{ matrix.otp }} $HOME/.kerl/${{ matrix.otp }}
     - name: build ${{ matrix.profile }}
       run: |
-        . $HOME/.kerl/${{ matrix.otp_vsn }}/activate
+        . $HOME/.kerl/${{ matrix.otp }}/activate
         make ensure-rebar3
         sudo cp rebar3 /usr/local/bin/rebar3
         make ${{ matrix.profile }}-zip