From 1b27828e3e309de2038e03be0b947e2c77035d4d Mon Sep 17 00:00:00 2001 From: Ivan Dyachkov Date: Thu, 22 Dec 2022 10:44:51 +0100 Subject: [PATCH 1/3] ci: make homebrew more conservative --- .github/actions/package-macos/action.yaml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/actions/package-macos/action.yaml b/.github/actions/package-macos/action.yaml index 18afbd495..726a1d3f7 100644 --- a/.github/actions/package-macos/action.yaml +++ b/.github/actions/package-macos/action.yaml @@ -25,6 +25,10 @@ runs: 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 From 9e0a130a8967aac23f3910541cef54d1aeb72673 Mon Sep 17 00:00:00 2001 From: Ivan Dyachkov Date: Thu, 22 Dec 2022 10:48:48 +0100 Subject: [PATCH 2/3] ci: use our own fork of setup-beam --- .github/workflows/build_packages.yaml | 4 ++-- .github/workflows/build_slim_packages.yaml | 4 ++-- .github/workflows/run_automate_tests.yaml | 4 ++-- .github/workflows/run_fvt_tests.yaml | 8 ++++---- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build_packages.yaml b/.github/workflows/build_packages.yaml index 2f6ce7b46..373a1ca06 100644 --- a/.github/workflows/build_packages.yaml +++ b/.github/workflows/build_packages.yaml @@ -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 diff --git a/.github/workflows/build_slim_packages.yaml b/.github/workflows/build_slim_packages.yaml index cd0d507f8..7ef67aa8c 100644 --- a/.github/workflows/build_slim_packages.yaml +++ b/.github/workflows/build_slim_packages.yaml @@ -84,11 +84,11 @@ jobs: profile: - emqx otp: - - 24.3.4.2 + - 24.3.4.6 steps: - uses: actions/checkout@v2 - 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 diff --git a/.github/workflows/run_automate_tests.yaml b/.github/workflows/run_automate_tests.yaml index 7bae9ff60..d8f68a256 100644 --- a/.github/workflows/run_automate_tests.yaml +++ b/.github/workflows/run_automate_tests.yaml @@ -27,9 +27,9 @@ jobs: name: apache-jmeter.tgz path: /tmp/apache-jmeter.tgz - uses: actions/checkout@v2 - - 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: | diff --git a/.github/workflows/run_fvt_tests.yaml b/.github/workflows/run_fvt_tests.yaml index 7078dfb5b..0a484eb34 100644 --- a/.github/workflows/run_fvt_tests.yaml +++ b/.github/workflows/run_fvt_tests.yaml @@ -13,9 +13,9 @@ jobs: steps: - uses: actions/checkout@v1 - - 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 @@ -76,9 +76,9 @@ jobs: steps: - uses: actions/checkout@v1 - - 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 From a2063a14453ce7070b4d5475761a135e13da1a87 Mon Sep 17 00:00:00 2001 From: Ivan Dyachkov Date: Thu, 22 Dec 2022 11:06:55 +0100 Subject: [PATCH 3/3] ci: move mandatory inputs up --- .github/actions/package-macos/action.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/actions/package-macos/action.yaml b/.github/actions/package-macos/action.yaml index 726a1d3f7..7e9a3cf9d 100644 --- a/.github/actions/package-macos/action.yaml +++ b/.github/actions/package-macos/action.yaml @@ -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,6 +15,10 @@ inputs: apple_developer_id_bundle_password: required: true type: string + os: + required: false + type: string + default: macos-11 runs: using: composite