From 86ea3f2de2c987f3cc37cc3b599432e78062dbf9 Mon Sep 17 00:00:00 2001 From: Ivan Dyachkov Date: Mon, 8 May 2023 09:51:05 +0200 Subject: [PATCH 1/3] ci(build_packages_cron): remove non-existing dependency also build emqx package on master only, and ee on release-50 only --- .github/workflows/build_packages_cron.yaml | 24 +++++++++++++--------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build_packages_cron.yaml b/.github/workflows/build_packages_cron.yaml index aace0d241..36406cd1f 100644 --- a/.github/workflows/build_packages_cron.yaml +++ b/.github/workflows/build_packages_cron.yaml @@ -11,7 +11,7 @@ on: jobs: linux: - needs: prepare + if: github.repository_owner == 'emqx' runs-on: aws-${{ matrix.arch }} # always run in builder container because the host might have the wrong OTP version etc. # otherwise buildx.sh does not run docker if arch and os matches the target arch and os. @@ -22,8 +22,8 @@ jobs: fail-fast: false matrix: profile: - - emqx - - emqx-enterprise + - ['emqx', 'master'] + - ['emqx-enterprise', 'release-50'] branch: - master - release-50 @@ -47,13 +47,13 @@ jobs: - uses: emqx/self-hosted-cleanup-action@v1.0.3 - uses: actions/checkout@v3 with: - ref: ${{ matrix.branch }} + ref: ${{ matrix.profile[1] }} fetch-depth: 0 - name: build emqx packages env: ELIXIR: ${{ matrix.elixir }} - PROFILE: ${{ matrix.profile }} + PROFILE: ${{ matrix.profile[0] }} ARCH: ${{ matrix.arch }} run: | set -eu @@ -71,8 +71,8 @@ jobs: - uses: actions/upload-artifact@v3 if: success() with: - name: ${{ matrix.profile }} - path: _packages/${{ matrix.profile }}/ + name: ${{ matrix.profile[0] }} + path: _packages/${{ matrix.profile[0] }}/ - name: Send notification to Slack uses: slackapi/slack-github-action@v1.23.0 if: failure() @@ -80,21 +80,25 @@ jobs: SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} with: payload: | - {"text": "Scheduled build of ${{ matrix.profile }} package for ${{ matrix.os }} failed: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}"} + {"text": "Scheduled build of ${{ matrix.profile[0] }} package for ${{ matrix.os }} failed: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}"} mac: - needs: prepare + runs-on: ${{ matrix.os }} + if: github.repository_owner == 'emqx' + strategy: fail-fast: false matrix: profile: - emqx + branch: + - master otp: - 24.3.4.2-3 os: - macos-12 - macos-12-arm64 - runs-on: ${{ matrix.os }} + steps: - uses: emqx/self-hosted-cleanup-action@v1.0.3 - uses: actions/checkout@v3 From 5b6561f33e853ed85f1f9f3d80a4777228dd4591 Mon Sep 17 00:00:00 2001 From: Ivan Dyachkov Date: Mon, 8 May 2023 09:52:16 +0200 Subject: [PATCH 2/3] ci(perf_test): run scheduled perf test workflow in emqx org only --- .github/workflows/performance_test.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/performance_test.yaml b/.github/workflows/performance_test.yaml index 00ba15ed0..1d474f7b2 100644 --- a/.github/workflows/performance_test.yaml +++ b/.github/workflows/performance_test.yaml @@ -14,6 +14,7 @@ on: jobs: prepare: runs-on: ubuntu-latest + if: github.repository_owner == 'emqx' container: ghcr.io/emqx/emqx-builder/5.0-34:1.13.4-25.1.2-3-ubuntu20.04 outputs: BENCH_ID: ${{ steps.prepare.outputs.BENCH_ID }} From 84ccb0bd77dba9028bc356793dc286a4045c2212 Mon Sep 17 00:00:00 2001 From: Ivan Dyachkov Date: Mon, 8 May 2023 09:53:11 +0200 Subject: [PATCH 3/3] ci: fix typo in workflow file name --- .github/workflows/{geen_master.yaml => green_master.yaml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .github/workflows/{geen_master.yaml => green_master.yaml} (100%) diff --git a/.github/workflows/geen_master.yaml b/.github/workflows/green_master.yaml similarity index 100% rename from .github/workflows/geen_master.yaml rename to .github/workflows/green_master.yaml