Skip to content

Commit 0824733

Browse files
jszwedkojszwedko
committed
Merge remote-tracking branch 'origin/master' into single-machine-performance/curta-and-consignor
2 parents 7e2c3fc + bc5822c commit 0824733

File tree

24 files changed

+182
-185
lines changed

24 files changed

+182
-185
lines changed

‎.github/actions/spelling/allow.txt

+1
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,7 @@ Samsung
165165
Sega
166166
Segoe
167167
Shopify
168+
SIGINTs
168169
Simvalley
169170
Skype
170171
Skytex

‎.github/workflows/environment.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
- name: Set up QEMU
4343
uses: docker/[email protected]
4444
- name: Set up Docker Buildx
45-
uses: docker/setup-buildx-action@v2.8.0
45+
uses: docker/setup-buildx-action@v2.9.0
4646
- name: Login to DockerHub
4747
uses: docker/[email protected]
4848
if: github.ref == 'refs/heads/master'

‎.github/workflows/integration.yml

+30-8
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,25 @@ jobs:
4646
int_tests: true
4747
secrets: inherit
4848

49+
detect-user:
50+
name: Detect user team membership
51+
runs-on: ubuntu-latest
52+
outputs:
53+
IS_TEAM_MEMBER: ${{ steps.author.outputs.isTeamMember }}
54+
steps:
55+
- name: Get PR author
56+
if: github.event_name == 'pull_request'
57+
id: author
58+
uses: tspascoal/get-user-teams-membership@v2
59+
with:
60+
username: ${{ github.actor }}
61+
team: 'Vector'
62+
GITHUB_TOKEN: ${{ secrets.GH_PAT_ORG }}
63+
4964
integration-tests:
5065
name: Integration Tests
5166
runs-on: [linux, ubuntu-20.04-4core]
52-
needs: changes
67+
needs: [changes, detect-user]
5368
if: always() && (
5469
github.event_name == 'merge_group' || (
5570
needs.changes.outputs.all-int == 'true'
@@ -103,7 +118,8 @@ jobs:
103118
max_attempts: 3
104119
command: bash scripts/ci-integration-test.sh amqp
105120

106-
- if: ${{ github.event_name == 'merge_group' || needs.changes.outputs.all-int == 'true' || needs.changes.outputs.appsignal == 'true' }}
121+
- if: (github.event_name == 'merge_group' || needs.changes.outputs.all-int == 'true' || needs.changes.outputs.appsignal == 'true') &&
122+
(github.event_name != 'pull_request' || needs.detect-user.outputs.IS_TEAM_MEMBER == 'true')
107123
name: appsignal
108124
uses: nick-fields/retry@v2
109125
with:
@@ -119,7 +135,8 @@ jobs:
119135
max_attempts: 3
120136
command: bash scripts/ci-integration-test.sh aws
121137

122-
- if: ${{ github.event_name == 'merge_group' || needs.changes.outputs.all-int == 'true' || needs.changes.outputs.axiom == 'true' }}
138+
- if: (github.event_name == 'merge_group' || needs.changes.outputs.all-int == 'true' || needs.changes.outputs.axiom == 'true') &&
139+
(github.event_name != 'pull_request' || needs.detect-user.outputs.IS_TEAM_MEMBER == 'true')
123140
name: axiom
124141
uses: nick-fields/retry@v2
125142
with:
@@ -143,39 +160,44 @@ jobs:
143160
max_attempts: 3
144161
command: bash scripts/ci-integration-test.sh clickhouse
145162

146-
- if: ${{ github.event_name == 'merge_group' || needs.changes.outputs.all-int == 'true' || needs.changes.outputs.databend == 'true' }}
163+
- if: (github.event_name == 'merge_group' || needs.changes.outputs.all-int == 'true' || needs.changes.outputs.databend == 'true') &&
164+
(github.event_name != 'pull_request' || needs.detect-user.outputs.IS_TEAM_MEMBER == 'true')
147165
name: databend
148166
uses: nick-fields/retry@v2
149167
with:
150168
timeout_minutes: 30
151169
max_attempts: 3
152170
command: bash scripts/ci-integration-test.sh databend
153171

154-
- if: ${{ github.event_name == 'merge_group' || needs.changes.outputs.all-int == 'true' || needs.changes.outputs.datadog == 'true' }}
172+
- if: (github.event_name == 'merge_group' || needs.changes.outputs.all-int == 'true' || needs.changes.outputs.datadog == 'true') &&
173+
(github.event_name != 'pull_request' || needs.detect-user.outputs.IS_TEAM_MEMBER == 'true')
155174
name: datadog-agent
156175
uses: nick-fields/retry@v2
157176
with:
158177
timeout_minutes: 30
159178
max_attempts: 3
160179
command: bash scripts/ci-integration-test.sh datadog-agent
161180

162-
- if: ${{ github.event_name == 'merge_group' || needs.changes.outputs.all-int == 'true' || needs.changes.outputs.datadog == 'true' }}
181+
- if: (github.event_name == 'merge_group' || needs.changes.outputs.all-int == 'true' || needs.changes.outputs.datadog == 'true') &&
182+
(github.event_name != 'pull_request' || needs.detect-user.outputs.IS_TEAM_MEMBER == 'true')
163183
name: datadog-logs
164184
uses: nick-fields/retry@v2
165185
with:
166186
timeout_minutes: 30
167187
max_attempts: 3
168188
command: bash scripts/ci-integration-test.sh datadog-logs
169189

170-
- if: ${{ github.event_name == 'merge_group' || needs.changes.outputs.all-int == 'true' || needs.changes.outputs.datadog == 'true' }}
190+
- if: (github.event_name == 'merge_group' || needs.changes.outputs.all-int == 'true' || needs.changes.outputs.datadog == 'true') &&
191+
(github.event_name != 'pull_request' || needs.detect-user.outputs.IS_TEAM_MEMBER == 'true')
171192
name: datadog-metrics
172193
uses: nick-fields/retry@v2
173194
with:
174195
timeout_minutes: 30
175196
max_attempts: 3
176197
command: bash scripts/ci-integration-test.sh datadog-metrics
177198

178-
- if: ${{ github.event_name == 'merge_group' || needs.changes.outputs.all-int == 'true' || needs.changes.outputs.datadog == 'true' }}
199+
- if: (github.event_name == 'merge_group' || needs.changes.outputs.all-int == 'true' || needs.changes.outputs.datadog == 'true') &&
200+
(github.event_name != 'pull_request' || needs.detect-user.outputs.IS_TEAM_MEMBER == 'true')
179201
name: datadog-traces
180202
uses: nick-fields/retry@v2
181203
with:

‎.github/workflows/publish.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -435,7 +435,7 @@ jobs:
435435
platforms: all
436436
- name: Set up Docker Buildx
437437
id: buildx
438-
uses: docker/setup-buildx-action@v2.8.0
438+
uses: docker/setup-buildx-action@v2.9.0
439439
with:
440440
version: latest
441441
install: true

‎.github/workflows/regression.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,7 @@ jobs:
298298

299299
- name: Set up Docker Buildx
300300
id: buildx
301-
uses: docker/setup-buildx-action@v2.8.0
301+
uses: docker/setup-buildx-action@v2.9.0
302302

303303
- name: Build 'vector' target image
304304
uses: docker/[email protected]
@@ -335,7 +335,7 @@ jobs:
335335

336336
- name: Set up Docker Buildx
337337
id: buildx
338-
uses: docker/setup-buildx-action@v2.8.0
338+
uses: docker/setup-buildx-action@v2.9.0
339339

340340
- name: Build 'vector' target image
341341
uses: docker/[email protected]

0 commit comments

Comments
 (0)