Skip to content

Commit 2d56413

Browse files
authored
Merge pull request #11674 from getsentry/develop
Gitflow: Sync develop into master
2 parents 6c8aeff + 3e614ba commit 2d56413

File tree

37 files changed

+629
-40
lines changed

37 files changed

+629
-40
lines changed

.github/ISSUE_TEMPLATE/flaky.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ body:
1818
id: job-name
1919
attributes:
2020
label: Name of Job
21-
placeholder: Build & Test / Nextjs (Node 14) Tests
21+
placeholder: "CI: Build & Test / Nextjs (Node 14) Tests"
2222
description: name of job as reported in the status report
2323
validations:
2424
required: true

.github/workflows/auto-release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Gitflow - Auto prepare release
1+
name: "Gitflow: Auto prepare release"
22
on:
33
pull_request:
44
types:
@@ -25,7 +25,7 @@ jobs:
2525
# Parse version from head branch
2626
text: ${{ github.head_ref }}
2727
# match: preprare-release/xx.xx.xx
28-
regex: '^prepare-release\/(\d+\.\d+\.\d+)$'
28+
regex: '^prepare-release\/(\d+\.\d+\.\d+)(?:-(alpha|beta)\.\d+)?$'
2929

3030
- name: Prepare release
3131
uses: getsentry/action-prepare-release@v1

.github/workflows/build.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
1-
name: 'Build & Test'
1+
name: 'CI: Build & Test'
22
on:
33
push:
44
branches:
55
- develop
66
- master
77
- release/**
88
pull_request:
9+
merge_group:
10+
types: [checks_requested]
911
workflow_dispatch:
1012
inputs:
1113
commit:
@@ -1051,6 +1053,7 @@ jobs:
10511053
'node-nestjs-app',
10521054
'node-exports-test-app',
10531055
'node-koa-app',
1056+
'node-connect-app',
10541057
'vue-3',
10551058
'webpack-4',
10561059
'webpack-5'

.github/workflows/canary.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: 'Canary Tests'
1+
name: 'CI: Canary Tests'
22
on:
33
schedule:
44
# Run every day at midnight

.github/workflows/clear-cache.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Clear all GHA caches
1+
name: "Action: Clear all GHA caches"
22
on:
33
workflow_dispatch:
44

.github/workflows/codeql-analysis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
# the `language` matrix defined below to confirm you have the correct set of
1010
# supported CodeQL languages.
1111
#
12-
name: 'CodeQL'
12+
name: 'CI: CodeQL'
1313

1414
on:
1515
push:

.github/workflows/enforce-license-compliance.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Enforce License Compliance
1+
name: "CI: Enforce License Compliance"
22

33
on:
44
push:

.github/workflows/flaky-test-detector.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: 'Detect flaky tests'
1+
name: 'CI: Detect flaky tests'
22
on:
33
workflow_dispatch:
44
pull_request:

.github/workflows/gitflow-sync-develop.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Gitflow - Sync master into develop
1+
name: "Gitflow: Sync master into develop"
22
on:
33
push:
44
branches:

.github/workflows/issue-package-label.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: 'Tag issue with package label'
1+
name: 'Automation: Tag issue with package label'
22

33
on:
44
issues:

0 commit comments

Comments
 (0)