Merge remote-tracking branch 'zmstone/0602-ci-use-erlef-setup-beam' into main-v4.4

This commit is contained in:
Zaiming (Stone) Shi 2022-06-02 13:47:39 +02:00
commit 7ebc9fc205
1 changed files with 3 additions and 4 deletions

View File

@ -34,8 +34,6 @@ jobs:
make emqx-docker make emqx-docker
fi fi
- name: make emqx image - name: make emqx image
env:
OTP_VSN: 24.1.5-3
run: make ${PROFILE}-docker run: make ${PROFILE}-docker
- name: run emqx - name: run emqx
timeout-minutes: 5 timeout-minutes: 5
@ -78,6 +76,9 @@ jobs:
steps: steps:
- uses: actions/checkout@v1 - uses: actions/checkout@v1
- uses: erlef/setup-beam@v1
with:
otp-version: "24.1.5"
- name: prepare - name: prepare
run: | run: |
if make emqx-ee --dry-run > /dev/null 2>&1; then if make emqx-ee --dry-run > /dev/null 2>&1; then
@ -94,8 +95,6 @@ jobs:
echo "EMQX_TAG=$(./pkg-vsn.sh)" >> $GITHUB_ENV echo "EMQX_TAG=$(./pkg-vsn.sh)" >> $GITHUB_ENV
fi fi
- name: make emqx image - name: make emqx image
env:
OTP_VSN: 24.1.5-3
run: make ${PROFILE}-docker run: make ${PROFILE}-docker
- name: install k3s - name: install k3s
env: env: