Skip to content

Commit 4141a0f

Browse files
lhoguinlhoguin
committed
Everything mixed
1 parent 29df2a4 commit 4141a0f

File tree

3 files changed

+108
-114
lines changed

3 files changed

+108
-114
lines changed

‎.github/workflows/test-make-target.yaml‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ on:
1111
metadata_store:
1212
required: true
1313
type: string
14+
mixed_clusters:
15+
required: true
16+
type: boolean
1417
make_target:
1518
required: true
1619
type: string
@@ -41,6 +44,31 @@ jobs:
4144
# restricted to the build jobs to avoid duplication in output.
4245
disable_problem_matchers: true
4346

47+
- name: MIXED CLUSTERS - FETCH SIGNING KEYS
48+
uses: dsaltares/fetch-gh-release-asset@master
49+
if: inputs.mixed_clusters
50+
with:
51+
repo: rabbitmq/signing-keys
52+
file: rabbitmq-release-signing-key.asc
53+
54+
- name: MIXED CLUSTERS - FETCH PREVIOUS VERSION
55+
id: fetch_secondary_dist
56+
uses: dsaltares/fetch-gh-release-asset@master
57+
if: inputs.mixed_clusters
58+
with:
59+
regex: true
60+
file: "rabbitmq-server-generic-unix-[\\d.]*\\.tar.xz"
61+
target: ./
62+
63+
- name: MIXED CLUSTERS - SETUP SECONDARY_DIST
64+
if: inputs.mixed_clusters
65+
run: |
66+
gpg --import rabbitmq-release-signing-key.asc
67+
gpg --verify rabbitmq-server-generic-unix-*.asc rabbitmq-server-generic-unix-*.tar.xz
68+
tar xf rabbitmq-server-generic-unix-*.tar.xz
69+
70+
echo "SECONDARY_DIST=${GITHUB_WORKSPACE}/rabbitmq_server-`echo -n ${{ steps.fetch_secondary_dist.outputs.version }} | sed s/v//`" >> $GITHUB_ENV
71+
4472
- name: SETUP DOTNET (rabbit)
4573
uses: actions/setup-dotnet@v4
4674
if: inputs.plugin == 'rabbit'

‎.github/workflows/test-make-tests.yaml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ on:
1111
metadata_store:
1212
required: true
1313
type: string
14+
mixed_clusters:
15+
required: true
16+
type: boolean
1417
jobs:
1518
test-rabbit:
1619
name: Test rabbit
@@ -33,6 +36,7 @@ jobs:
3336
erlang_version: ${{ inputs.erlang_version }}
3437
elixir_version: ${{ inputs.elixir_version }}
3538
metadata_store: ${{ inputs.metadata_store }}
39+
mixed_clusters: ${{ inputs.mixed_clusters }}
3640
make_target: ${{ matrix.make_target }}
3741
plugin: rabbit
3842

@@ -43,6 +47,7 @@ jobs:
4347
erlang_version: ${{ inputs.erlang_version }}
4448
elixir_version: ${{ inputs.elixir_version }}
4549
metadata_store: ${{ inputs.metadata_store }}
50+
mixed_clusters: ${{ inputs.mixed_clusters }}
4651
make_target: parallel-ct-set-1
4752
plugin: rabbitmq_mqtt
4853

@@ -55,6 +60,7 @@ jobs:
5560
erlang_version: ${{ inputs.erlang_version }}
5661
elixir_version: ${{ inputs.elixir_version }}
5762
metadata_store: ${{ inputs.metadata_store }}
63+
mixed_clusters: ${{ inputs.mixed_clusters }}
5864
make_target: ct-config_schema ct-unit
5965
plugin: rabbitmq_peer_discovery_aws
6066

@@ -110,5 +116,6 @@ jobs:
110116
erlang_version: ${{ inputs.erlang_version }}
111117
elixir_version: ${{ inputs.elixir_version }}
112118
metadata_store: ${{ inputs.metadata_store }}
119+
mixed_clusters: ${{ inputs.mixed_clusters }}
113120
make_target: tests
114121
plugin: ${{ matrix.plugin }}

‎.github/workflows/test-make.yaml‎

Lines changed: 73 additions & 114 deletions
Original file line numberDiff line numberDiff line change
@@ -15,69 +15,19 @@ concurrency:
1515
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
1616
cancel-in-progress: true
1717
jobs:
18-
# build-and-xref:
19-
# name: Build and Xref
20-
# strategy:
21-
# fail-fast: false
22-
# matrix:
23-
# erlang_version:
24-
# - '26'
25-
# - '27'
26-
# elixir_version:
27-
# - '1.17'
28-
# # @todo Add macOS and Windows.
29-
# runs-on: ubuntu-latest
30-
# timeout-minutes: 30
31-
# steps:
32-
# - name: CHECKOUT REPOSITORY
33-
# uses: actions/checkout@v4
34-
#
35-
# - name: FETCH TAGS
36-
# run: git fetch --tags
37-
#
38-
# - name: SETUP OTP & ELIXIR
39-
# uses: erlef/[email protected]
40-
# with:
41-
# otp-version: ${{ matrix.erlang_version }}
42-
# elixir-version: ${{ matrix.elixir_version }}
43-
# hexpm-mirrors: |
44-
# https://builds.hex.pm
45-
# https://cdn.jsdelivr.net/hex
46-
#
47-
# - name: SANITY CHECK (rabbit)
48-
# run: make -C deps/rabbit parallel-ct-sanity-check
49-
#
50-
# - name: SANITY CHECK (rabbitmq_mqtt)
51-
# run: make -C deps/rabbitmq_mqtt parallel-ct-sanity-check
52-
#
53-
# - name: BUILD
54-
# run: make
55-
#
56-
# - name: XREF
57-
# run: make xref
58-
59-
# test:
60-
# name: Test
61-
# strategy:
62-
# fail-fast: false
63-
# matrix:
64-
# erlang_version:
65-
# - '26'
66-
## - '27'
67-
# elixir_version:
68-
# - '1.17'
69-
# metadata_store:
70-
# - mnesia
71-
# - khepri
72-
# uses: ./.github/workflows/test-make-tests.yaml
73-
# with:
74-
# erlang_version: ${{ matrix.erlang_version }}
75-
# elixir_version: ${{ matrix.elixir_version }}
76-
# metadata_store: ${{ matrix.metadata_store }}
77-
78-
test-mixed:
79-
name: Mixed version testing
18+
build-and-xref:
19+
name: Build and Xref
20+
strategy:
21+
fail-fast: false
22+
matrix:
23+
erlang_version:
24+
- '26'
25+
- '27'
26+
elixir_version:
27+
- '1.17'
28+
# @todo Add macOS and Windows.
8029
runs-on: ubuntu-latest
30+
timeout-minutes: 30
8131
steps:
8232
- name: CHECKOUT REPOSITORY
8333
uses: actions/checkout@v4
@@ -88,65 +38,74 @@ jobs:
8838
- name: SETUP OTP & ELIXIR
8939
uses: erlef/[email protected]
9040
with:
91-
otp-version: '27'
92-
elixir-version: '1.17'
41+
otp-version: ${{ matrix.erlang_version }}
42+
elixir-version: ${{ matrix.elixir_version }}
9343
hexpm-mirrors: |
9444
https://builds.hex.pm
9545
https://cdn.jsdelivr.net/hex
96-
# This currently only applies to Elixir; and can be safely
97-
# restricted to the build jobs to avoid duplication in output.
98-
disable_problem_matchers: true
9946
100-
- name: MIXED VERSIONS - FETCH SIGNING KEYS
101-
uses: dsaltares/fetch-gh-release-asset@master
102-
with:
103-
repo: rabbitmq/signing-keys
104-
file: rabbitmq-release-signing-key.asc
105-
106-
- name: MIXED VERSIONS - FETCH PREVIOUS VERSION
107-
id: fetch_secondary_dist
108-
uses: dsaltares/fetch-gh-release-asset@master
109-
with:
110-
regex: true
111-
file: "rabbitmq-server-generic-unix-[\\d.]*\\.tar.xz"
112-
target: ./
47+
- name: SANITY CHECK (rabbit)
48+
run: make -C deps/rabbit parallel-ct-sanity-check
11349

114-
# - run: echo "${{ steps.secondary_dist.outputs.version }}"
50+
- name: SANITY CHECK (rabbitmq_mqtt)
51+
run: make -C deps/rabbitmq_mqtt parallel-ct-sanity-check
11552

116-
- name: MIXED VERSIONS - SETUP SECONDARY_DIST
117-
run: |
118-
gpg --import rabbitmq-release-signing-key.asc
119-
gpg --verify rabbitmq-server-generic-unix-*.asc rabbitmq-server-generic-unix-*.tar.xz
120-
tar xf rabbitmq-server-generic-unix-*.tar.xz
53+
- name: BUILD
54+
run: make
12155

122-
echo "SECONDARY_DIST=${GITHUB_WORKSPACE}/rabbitmq_server-`echo -n ${{ steps.fetch_secondary_dist.outputs.version }} | sed s/v//`" >> $GITHUB_ENV
56+
- name: XREF
57+
run: make xref
12358

124-
# - run: ls -la
125-
126-
- name: RUN TESTS
127-
run: |
128-
make -C deps/rabbit ct-cluster_upgrade
129-
130-
- name: UPLOAD TEST LOGS
131-
if: always()
132-
uses: actions/upload-artifact@v4
133-
with:
134-
name: CT logs mixed
135-
path: |
136-
logs/
137-
# !logs/**/log_private
138-
if-no-files-found: ignore
59+
test:
60+
name: Test
61+
strategy:
62+
fail-fast: false
63+
matrix:
64+
erlang_version:
65+
- '26'
66+
# - '27'
67+
elixir_version:
68+
- '1.17'
69+
metadata_store:
70+
- mnesia
71+
- khepri
72+
uses: ./.github/workflows/test-make-tests.yaml
73+
with:
74+
erlang_version: ${{ matrix.erlang_version }}
75+
elixir_version: ${{ matrix.elixir_version }}
76+
metadata_store: ${{ matrix.metadata_store }}
77+
mixed_clusters: false
13978

140-
# type-check:
141-
# name: Type check
142-
# strategy:
143-
# fail-fast: false
144-
# matrix:
145-
# erlang_version: # Latest OTP
79+
test-mixed-clusters:
80+
name: Test
81+
strategy:
82+
fail-fast: false
83+
matrix:
84+
erlang_version:
85+
- '26'
14686
# - '27'
147-
# elixir_version: # Latest Elixir
148-
# - '1.17'
149-
# uses: ./.github/workflows/test-make-type-check.yaml
150-
# with:
151-
# erlang_version: ${{ matrix.erlang_version }}
152-
# elixir_version: ${{ matrix.elixir_version }}
87+
elixir_version:
88+
- '1.17'
89+
metadata_store:
90+
- mnesia
91+
# - khepri
92+
uses: ./.github/workflows/test-make-tests.yaml
93+
with:
94+
erlang_version: ${{ matrix.erlang_version }}
95+
elixir_version: ${{ matrix.elixir_version }}
96+
metadata_store: ${{ matrix.metadata_store }}
97+
mixed_clusters: true
98+
99+
type-check:
100+
name: Type check
101+
strategy:
102+
fail-fast: false
103+
matrix:
104+
erlang_version: # Latest OTP
105+
- '27'
106+
elixir_version: # Latest Elixir
107+
- '1.17'
108+
uses: ./.github/workflows/test-make-type-check.yaml
109+
with:
110+
erlang_version: ${{ matrix.erlang_version }}
111+
elixir_version: ${{ matrix.elixir_version }}

0 commit comments

Comments
 (0)