فهرست منبع

fix: update elixir CI yamls for getting rebar3

Shawn 3 سال پیش
والد
کامیت
50f1dcef97
3فایلهای تغییر یافته به همراه3 افزوده شده و 2 حذف شده
  1. 1 1
      .github/workflows/elixir_apps_check.yaml
  2. 1 1
      .github/workflows/elixir_deps_check.yaml
  3. 1 0
      scripts/ensure-rebar3.sh

+ 1 - 1
.github/workflows/elixir_apps_check.yaml

@@ -36,7 +36,7 @@ jobs:
         with:
         with:
           fetch-depth: 0
           fetch-depth: 0
       - name: ensure rebar
       - name: ensure rebar
-        run: ./scripts/ensure-rebar3.sh 3.16.1-emqx-1
+        run: ./scripts/ensure-rebar3.sh
       - name: check applications
       - name: check applications
         run: ./scripts/check-elixir-applications.exs
         run: ./scripts/check-elixir-applications.exs
       - name: check applications started with emqx_machine
       - name: check applications started with emqx_machine

+ 1 - 1
.github/workflows/elixir_deps_check.yaml

@@ -13,7 +13,7 @@ jobs:
       - name: Checkout
       - name: Checkout
         uses: actions/checkout@v2.4.0
         uses: actions/checkout@v2.4.0
       - name: ensure rebar
       - name: ensure rebar
-        run: ./scripts/ensure-rebar3.sh 3.16.1-emqx-1
+        run: ./scripts/ensure-rebar3.sh
       - name: setup mix
       - name: setup mix
         run: |
         run: |
           mix local.hex --force
           mix local.hex --force

+ 1 - 0
scripts/ensure-rebar3.sh

@@ -5,6 +5,7 @@ set -euo pipefail
 ## rebar3 tag 3.18.0-emqx-1 is compiled using otp24.1.5.
 ## rebar3 tag 3.18.0-emqx-1 is compiled using otp24.1.5.
 ## we have to use an otp24-compiled rebar3 because the defination of record #application{}
 ## we have to use an otp24-compiled rebar3 because the defination of record #application{}
 ## in systools.hrl is changed in otp24.
 ## in systools.hrl is changed in otp24.
+OTP_VSN="${OTP_VSN:-$(./scripts/get-otp-vsn.sh)}"
 case ${OTP_VSN} in
 case ${OTP_VSN} in
     23*)
     23*)
         VERSION="3.16.1-emqx-1"
         VERSION="3.16.1-emqx-1"