Skip to content

Commit 834bf35

Browse files
kwnathkwnath
authored
Merge branch 'getsentry:master' into master
2 parents 8cc1ef3 + da0b086 commit 834bf35

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+1770
-128
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
timeout-minutes: 10
2525

2626
steps:
27-
- uses: actions/[email protected].1
27+
- uses: actions/[email protected].2
2828
- uses: actions/setup-python@v5
2929
with:
3030
python-version: 3.12
@@ -39,7 +39,7 @@ jobs:
3939
timeout-minutes: 10
4040

4141
steps:
42-
- uses: actions/[email protected].1
42+
- uses: actions/[email protected].2
4343
- uses: actions/setup-python@v5
4444
with:
4545
python-version: 3.12
@@ -54,7 +54,7 @@ jobs:
5454
timeout-minutes: 10
5555

5656
steps:
57-
- uses: actions/[email protected].1
57+
- uses: actions/[email protected].2
5858
- uses: actions/setup-python@v5
5959
with:
6060
python-version: 3.12
@@ -85,7 +85,7 @@ jobs:
8585
timeout-minutes: 10
8686

8787
steps:
88-
- uses: actions/[email protected].1
88+
- uses: actions/[email protected].2
8989
- uses: actions/setup-python@v5
9090
with:
9191
python-version: 3.12

‎.github/workflows/codeql-analysis.yml‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,15 @@ on:
1717
- master
1818
- sentry-sdk-2.0
1919
pull_request:
20-
# The branches below must be a subset of the branches above
21-
branches:
22-
- master
23-
- sentry-sdk-2.0
2420
schedule:
2521
- cron: '18 18 * * 3'
2622

23+
# Cancel in progress workflows on pull_requests.
24+
# https://docs.github.com/en/actions/using-jobs/using-concurrency#example-using-a-fallback-value
25+
concurrency:
26+
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
27+
cancel-in-progress: true
28+
2729
permissions:
2830
contents: read
2931

@@ -46,7 +48,7 @@ jobs:
4648

4749
steps:
4850
- name: Checkout repository
49-
uses: actions/[email protected].1
51+
uses: actions/[email protected].2
5052

5153
# Initializes the CodeQL tools for scanning.
5254
- name: Initialize CodeQL

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,11 @@ on:
88
- release/*
99
- sentry-sdk-2.0
1010
pull_request:
11-
branches:
12-
- master
13-
- main
14-
- sentry-sdk-2.0
11+
12+
# Cancel in progress workflows on pull_requests.
13+
# https://docs.github.com/en/actions/using-jobs/using-concurrency#example-using-a-fallback-value
14+
concurrency:
15+
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
1516

1617
jobs:
1718
enforce-license-compliance:

‎.github/workflows/release.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
runs-on: ubuntu-latest
1919
name: "Release a new version"
2020
steps:
21-
- uses: actions/[email protected].1
21+
- uses: actions/[email protected].2
2222
with:
2323
token: ${{ secrets.GH_RELEASE_PAT }}
2424
fetch-depth: 0

‎.github/workflows/test-integrations-ai.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
# see https://github.com/actions/setup-python/issues/544#issuecomment-1332535877
3535
os: [ubuntu-20.04]
3636
steps:
37-
- uses: actions/[email protected].1
37+
- uses: actions/[email protected].2
3838
- uses: actions/setup-python@v5
3939
with:
4040
python-version: ${{ matrix.python-version }}
@@ -106,7 +106,7 @@ jobs:
106106
# see https://github.com/actions/setup-python/issues/544#issuecomment-1332535877
107107
os: [ubuntu-20.04]
108108
steps:
109-
- uses: actions/[email protected].1
109+
- uses: actions/[email protected].2
110110
- uses: actions/setup-python@v5
111111
with:
112112
python-version: ${{ matrix.python-version }}
@@ -165,7 +165,7 @@ jobs:
165165
files: .junitxml
166166
verbose: true
167167
check_required_tests:
168-
name: All AI tests passed
168+
name: All pinned AI tests passed
169169
needs: test-ai-pinned
170170
# Always run this, even if a dependent job failed
171171
if: always()

‎.github/workflows/test-integrations-aws-lambda.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
name: permissions check
3333
runs-on: ubuntu-20.04
3434
steps:
35-
- uses: actions/[email protected].1
35+
- uses: actions/[email protected].2
3636
with:
3737
persist-credentials: false
3838
- name: Check permissions on PR
@@ -67,7 +67,7 @@ jobs:
6767
os: [ubuntu-20.04]
6868
needs: check-permissions
6969
steps:
70-
- uses: actions/[email protected].1
70+
- uses: actions/[email protected].2
7171
with:
7272
ref: ${{ github.event.pull_request.head.sha || github.ref }}
7373
- uses: actions/setup-python@v5
@@ -112,7 +112,7 @@ jobs:
112112
files: .junitxml
113113
verbose: true
114114
check_required_tests:
115-
name: All AWS Lambda tests passed
115+
name: All pinned AWS Lambda tests passed
116116
needs: test-aws_lambda-pinned
117117
# Always run this, even if a dependent job failed
118118
if: always()

‎.github/workflows/test-integrations-cloud-computing.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
# see https://github.com/actions/setup-python/issues/544#issuecomment-1332535877
3535
os: [ubuntu-20.04]
3636
steps:
37-
- uses: actions/[email protected].1
37+
- uses: actions/[email protected].2
3838
- uses: actions/setup-python@v5
3939
with:
4040
python-version: ${{ matrix.python-version }}
@@ -102,7 +102,7 @@ jobs:
102102
# see https://github.com/actions/setup-python/issues/544#issuecomment-1332535877
103103
os: [ubuntu-20.04]
104104
steps:
105-
- uses: actions/[email protected].1
105+
- uses: actions/[email protected].2
106106
- uses: actions/setup-python@v5
107107
with:
108108
python-version: ${{ matrix.python-version }}
@@ -157,7 +157,7 @@ jobs:
157157
files: .junitxml
158158
verbose: true
159159
check_required_tests:
160-
name: All Cloud Computing tests passed
160+
name: All pinned Cloud Computing tests passed
161161
needs: test-cloud_computing-pinned
162162
# Always run this, even if a dependent job failed
163163
if: always()

‎.github/workflows/test-integrations-common.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
# see https://github.com/actions/setup-python/issues/544#issuecomment-1332535877
3535
os: [ubuntu-20.04]
3636
steps:
37-
- uses: actions/[email protected].1
37+
- uses: actions/[email protected].2
3838
- uses: actions/setup-python@v5
3939
with:
4040
python-version: ${{ matrix.python-version }}
@@ -77,7 +77,7 @@ jobs:
7777
files: .junitxml
7878
verbose: true
7979
check_required_tests:
80-
name: All Common tests passed
80+
name: All pinned Common tests passed
8181
needs: test-common-pinned
8282
# Always run this, even if a dependent job failed
8383
if: always()

‎.github/workflows/test-integrations-data-processing.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
# see https://github.com/actions/setup-python/issues/544#issuecomment-1332535877
3535
os: [ubuntu-20.04]
3636
steps:
37-
- uses: actions/[email protected].1
37+
- uses: actions/[email protected].2
3838
- uses: actions/setup-python@v5
3939
with:
4040
python-version: ${{ matrix.python-version }}
@@ -120,7 +120,7 @@ jobs:
120120
# see https://github.com/actions/setup-python/issues/544#issuecomment-1332535877
121121
os: [ubuntu-20.04]
122122
steps:
123-
- uses: actions/[email protected].1
123+
- uses: actions/[email protected].2
124124
- uses: actions/setup-python@v5
125125
with:
126126
python-version: ${{ matrix.python-version }}
@@ -193,7 +193,7 @@ jobs:
193193
files: .junitxml
194194
verbose: true
195195
check_required_tests:
196-
name: All Data Processing tests passed
196+
name: All pinned Data Processing tests passed
197197
needs: test-data_processing-pinned
198198
# Always run this, even if a dependent job failed
199199
if: always()

‎.github/workflows/test-integrations-databases.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252
SENTRY_PYTHON_TEST_POSTGRES_USER: postgres
5353
SENTRY_PYTHON_TEST_POSTGRES_PASSWORD: sentry
5454
steps:
55-
- uses: actions/[email protected].1
55+
- uses: actions/[email protected].2
5656
- uses: actions/setup-python@v5
5757
with:
5858
python-version: ${{ matrix.python-version }}
@@ -147,7 +147,7 @@ jobs:
147147
SENTRY_PYTHON_TEST_POSTGRES_USER: postgres
148148
SENTRY_PYTHON_TEST_POSTGRES_PASSWORD: sentry
149149
steps:
150-
- uses: actions/[email protected].1
150+
- uses: actions/[email protected].2
151151
- uses: actions/setup-python@v5
152152
with:
153153
python-version: ${{ matrix.python-version }}
@@ -211,7 +211,7 @@ jobs:
211211
files: .junitxml
212212
verbose: true
213213
check_required_tests:
214-
name: All Databases tests passed
214+
name: All pinned Databases tests passed
215215
needs: test-databases-pinned
216216
# Always run this, even if a dependent job failed
217217
if: always()

0 commit comments

Comments
 (0)