Skip to content

Commit e6d0114

Browse files
committed
ci: try running make race sequantially
Signed-off-by: Ville Vesilehto <[email protected]>
1 parent 9798c17 commit e6d0114

File tree

1 file changed

+30
-12
lines changed

1 file changed

+30
-12
lines changed

.github/workflows/ci.yml

Lines changed: 30 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,30 +11,48 @@ env:
1111
CONSUL_LICENSE: ${{ secrets.CONSUL_LICENSE }}
1212

1313
jobs:
14-
run-tests:
15-
name: Run test cases (with consul${{ matrix.consul-ent-tag }})
16-
runs-on: ${{ matrix.os }}
17-
strategy:
18-
fail-fast: false
19-
matrix:
20-
os: [ubuntu-latest]
21-
go: [^1]
22-
consul-ent-tag: ["", "-enterprise"]
14+
run-tests-standard:
15+
name: Run test cases (standard)
16+
runs-on: ubuntu-latest # Assuming ubuntu-latest based on original matrix
2317

2418
steps:
2519
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
2620

2721
- name: Set up Go
2822
uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
2923
with:
30-
go-version: ${{ matrix.go }}
24+
go-version: ^1 # Assuming ^1 based on original matrix
3125
cache: false
3226

33-
- name: Install Consul${{ matrix.consul-ent-tag }}, Vault and Nomad for integration testing
27+
- name: Install Consul, Vault and Nomad for integration testing
3428
run: |
3529
curl -fsSL https://apt.releases.hashicorp.com/gpg | sudo apt-key add -
3630
sudo apt-add-repository "deb [arch=amd64] https://apt.releases.hashicorp.com $(lsb_release -cs) main"
37-
sudo apt-get update && sudo apt-get install consul${{ matrix.consul-ent-tag }} vault nomad
31+
sudo apt-get update && sudo apt-get install consul vault nomad
32+
33+
- name: Run tests
34+
run: |
35+
make test-race
36+
37+
run-tests-enterprise:
38+
name: Run test cases (enterprise)
39+
runs-on: ubuntu-latest # Assuming ubuntu-latest based on original matrix
40+
needs: run-tests-standard # Make this job depend on the standard tests
41+
42+
steps:
43+
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
44+
45+
- name: Set up Go
46+
uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
47+
with:
48+
go-version: ^1 # Assuming ^1 based on original matrix
49+
cache: false
50+
51+
- name: Install Consul-Enterprise, Vault and Nomad for integration testing
52+
run: |
53+
curl -fsSL https://apt.releases.hashicorp.com/gpg | sudo apt-key add -
54+
sudo apt-add-repository "deb [arch=amd64] https://apt.releases.hashicorp.com $(lsb_release -cs) main"
55+
sudo apt-get update && sudo apt-get install consul-enterprise vault nomad
3856
3957
- name: Run tests
4058
run: |

0 commit comments

Comments
 (0)