yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/release-v44' into 1221-sync-release-v44-to-main-v4.4

This commit is contained in:
Zaiming (Stone) Shi 2022-12-22 11:53:03 +01:00
parent f7e4f45b6c 1af768f75a
commit 44b9ad24fd
5 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
.github/actions/package-macos/action.yaml vendored
View File

@ -3,10 +3,6 @@ inputs:
otp: # 24.2.1-1, 23.3.4.9-3
required: true
type: string
os:
required: false
type: string
default: macos-11
apple_id_password:
required: true
type: string
@ -19,12 +15,20 @@ inputs:
apple_developer_id_bundle_password:
required: true
type: string
os:
required: false
type: string
default: macos-11
runs:
using: composite
steps:
- id: prepare
shell: bash
env:
HOMEBREW_NO_AUTO_UPDATE: 1
HOMEBREW_NO_INSTALL_UPGRADE: 1
HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK: 1
run: |
brew update
brew install curl zip unzip gnu-sed coreutils autoconf automake cmake unixodbc freetds openssl@1.1
@ -57,6 +61,9 @@ runs:
make install
- name: build
env:
HOMEBREW_NO_AUTO_UPDATE: 1
HOMEBREW_NO_INSTALL_UPGRADE: 1
HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK: 1
AUTO_INSTALL_BUILD_DEPS: 1
APPLE_SIGN_BINARIES: 1
APPLE_ID: developers@emqx.io

4
.github/workflows/build_packages.yaml vendored
View File

@ -59,7 +59,7 @@ jobs:
matrix:
profile: ${{fromJSON(needs.prepare.outputs.profiles)}}
otp:
- 24.3.4.2
- 24.3.4.6
exclude:
- profile: emqx-edge
steps:
@ -70,7 +70,7 @@ jobs:
- name: unzip source code
run: Expand-Archive -Path source.zip -DestinationPath ./
- uses: ilammy/msvc-dev-cmd@v1
- uses: erlef/setup-beam@v1
- uses: emqx/setup-beam@v1.16.1-emqx
with:
otp-version: ${{ matrix.otp }}
- name: build

4
.github/workflows/build_slim_packages.yaml vendored
View File

@ -84,11 +84,11 @@ jobs:
profile:
- emqx
otp:
- 24.3.4.2
- 24.3.4.6
steps:
- uses: actions/checkout@v3
- uses: ilammy/msvc-dev-cmd@v1
- uses: erlef/setup-beam@v1
- uses: emqx/setup-beam@v1.16.1-emqx
with:
otp-version: ${{ matrix.otp }}
- name: build

4
.github/workflows/run_automate_tests.yaml vendored
View File

@ -27,9 +27,9 @@ jobs:
name: apache-jmeter.tgz
path: /tmp/apache-jmeter.tgz
- uses: actions/checkout@v3
- uses: erlef/setup-beam@v1
- uses: emqx/setup-beam@v1.16.1-emqx
with:
otp-version: "24.3.4.2"
otp-version: 24.3.4.6
- name: prepare
id: prepare
run: |

11
.github/workflows/run_fvt_tests.yaml vendored
View File

@ -13,9 +13,9 @@ jobs:
steps:
- uses: actions/checkout@v3
- uses: erlef/setup-beam@v1
- uses: emqx/setup-beam@v1.16.1-emqx
with:
otp-version: "24.1.5"
otp-version: 24.3.4.6
- name: prepare
run: |
if make emqx-ee --dry-run > /dev/null 2>&1; then
@ -75,10 +75,15 @@ jobs:
- dns
steps:
<<<<<<< HEAD
- uses: actions/checkout@v3
- uses: erlef/setup-beam@v1
=======
- uses: actions/checkout@v1
- uses: emqx/setup-beam@v1.16.1-emqx
>>>>>>> origin/release-v44
with:
otp-version: "24.1.5"
otp-version: 24.3.4.6
- name: prepare
run: |
if make emqx-ee --dry-run > /dev/null 2>&1; then