Skip to content

Commit 18ae737

Browse files
sentrivanasentrivana
committed
Merge branch 'master' into sentry-sdk-2.0
2 parents ee66058 + 60e644c commit 18ae737

28 files changed

Lines changed: 280 additions & 180 deletions

‎.github/workflows/ci.yml‎

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

2626
steps:
27-
- uses: actions/checkout@v4
28-
- uses: actions/setup-python@v4
27+
- uses: actions/checkout@v4.1.1
28+
- uses: actions/setup-python@v5
2929
with:
3030
python-version: 3.12
3131

@@ -39,8 +39,8 @@ jobs:
3939
timeout-minutes: 10
4040

4141
steps:
42-
- uses: actions/checkout@v4
43-
- uses: actions/setup-python@v4
42+
- uses: actions/checkout@v4.1.1
43+
- uses: actions/setup-python@v5
4444
with:
4545
python-version: 3.12
4646

@@ -54,12 +54,12 @@ jobs:
5454
timeout-minutes: 10
5555

5656
steps:
57-
- uses: actions/checkout@v4
58-
- uses: actions/setup-python@v4
57+
- uses: actions/checkout@v4.1.1
58+
- uses: actions/setup-python@v5
5959
with:
6060
python-version: 3.12
6161
- name: Setup build cache
62-
uses: actions/cache@v3
62+
uses: actions/cache@v4
6363
id: build_cache
6464
with:
6565
path: ${{ env.CACHED_BUILD_PATHS }}
@@ -83,8 +83,8 @@ jobs:
8383
timeout-minutes: 10
8484

8585
steps:
86-
- uses: actions/checkout@v4
87-
- uses: actions/setup-python@v4
86+
- uses: actions/checkout@v4.1.1
87+
- uses: actions/setup-python@v5
8888
with:
8989
python-version: 3.12
9090

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,11 @@ jobs:
4646

4747
steps:
4848
- name: Checkout repository
49-
uses: actions/checkout@v4
49+
uses: actions/checkout@v4.1.1
5050

5151
# Initializes the CodeQL tools for scanning.
5252
- name: Initialize CodeQL
53-
uses: github/codeql-action/init@v2
53+
uses: github/codeql-action/init@v3
5454
with:
5555
languages: ${{ matrix.language }}
5656
# If you wish to specify custom queries, you can do so here or in a config file.
@@ -61,7 +61,7 @@ jobs:
6161
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
6262
# If this step fails, then you should remove it and run the build manually (see below)
6363
- name: Autobuild
64-
uses: github/codeql-action/autobuild@v2
64+
uses: github/codeql-action/autobuild@v3
6565

6666
# ℹ️ Command-line programs to run using the OS shell.
6767
# 📚 https://docs.github.com/en/actions/reference/workflow-syntax-for-github-actions
@@ -75,4 +75,4 @@ jobs:
7575
# make release
7676

7777
- name: Perform CodeQL Analysis
78-
uses: github/codeql-action/analyze@v2
78+
uses: github/codeql-action/analyze@v3

‎.github/workflows/release.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
runs-on: ubuntu-latest
1616
name: "Release a new version"
1717
steps:
18-
- uses: actions/checkout@v4
18+
- uses: actions/checkout@v4.1.1
1919
with:
2020
token: ${{ secrets.GH_RELEASE_PAT }}
2121
fetch-depth: 0

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
name: permissions check
3131
runs-on: ubuntu-20.04
3232
steps:
33-
- uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # v3.1.0
33+
- uses: actions/checkout@v4.1.1
3434
with:
3535
persist-credentials: false
3636
- name: Check permissions on PR
@@ -65,10 +65,10 @@ jobs:
6565
os: [ubuntu-20.04]
6666
needs: check-permissions
6767
steps:
68-
- uses: actions/checkout@v4
68+
- uses: actions/checkout@v4.1.1
6969
with:
7070
ref: ${{ github.event.pull_request.head.sha || github.ref }}
71-
- uses: actions/setup-python@v4
71+
- uses: actions/setup-python@v5
7272
with:
7373
python-version: ${{ matrix.python-version }}
7474
- name: Setup Test Env
@@ -85,7 +85,7 @@ jobs:
8585
run: |
8686
coverage combine .coverage*
8787
coverage xml -i
88-
- uses: codecov/codecov-action@v3
88+
- uses: codecov/codecov-action@v4
8989
with:
9090
token: ${{ secrets.CODECOV_TOKEN }}
9191
files: coverage.xml

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ jobs:
3232
# see https://github.com/actions/setup-python/issues/544#issuecomment-1332535877
3333
os: [ubuntu-20.04]
3434
steps:
35-
- uses: actions/checkout@v4
36-
- uses: actions/setup-python@v4
35+
- uses: actions/checkout@v4.1.1
36+
- uses: actions/setup-python@v5
3737
with:
3838
python-version: ${{ matrix.python-version }}
3939
- name: Setup Test Env
@@ -62,7 +62,7 @@ jobs:
6262
run: |
6363
coverage combine .coverage*
6464
coverage xml -i
65-
- uses: codecov/codecov-action@v3
65+
- uses: codecov/codecov-action@v4
6666
with:
6767
token: ${{ secrets.CODECOV_TOKEN }}
6868
files: coverage.xml
@@ -80,8 +80,8 @@ jobs:
8080
# see https://github.com/actions/setup-python/issues/544#issuecomment-1332535877
8181
os: [ubuntu-20.04]
8282
steps:
83-
- uses: actions/checkout@v4
84-
- uses: actions/setup-python@v4
83+
- uses: actions/checkout@v4.1.1
84+
- uses: actions/setup-python@v5
8585
with:
8686
python-version: ${{ matrix.python-version }}
8787
- name: Setup Test Env
@@ -110,7 +110,7 @@ jobs:
110110
run: |
111111
coverage combine .coverage*
112112
coverage xml -i
113-
- uses: codecov/codecov-action@v3
113+
- uses: codecov/codecov-action@v4
114114
with:
115115
token: ${{ secrets.CODECOV_TOKEN }}
116116
files: coverage.xml

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ jobs:
3232
# see https://github.com/actions/setup-python/issues/544#issuecomment-1332535877
3333
os: [ubuntu-20.04]
3434
steps:
35-
- uses: actions/checkout@v4
36-
- uses: actions/setup-python@v4
35+
- uses: actions/checkout@v4.1.1
36+
- uses: actions/setup-python@v5
3737
with:
3838
python-version: ${{ matrix.python-version }}
3939
- name: Setup Test Env
@@ -50,7 +50,7 @@ jobs:
5050
run: |
5151
coverage combine .coverage*
5252
coverage xml -i
53-
- uses: codecov/codecov-action@v3
53+
- uses: codecov/codecov-action@v4
5454
with:
5555
token: ${{ secrets.CODECOV_TOKEN }}
5656
files: coverage.xml

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ jobs:
3232
# see https://github.com/actions/setup-python/issues/544#issuecomment-1332535877
3333
os: [ubuntu-20.04]
3434
steps:
35-
- uses: actions/checkout@v4
36-
- uses: actions/setup-python@v4
35+
- uses: actions/checkout@v4.1.1
36+
- uses: actions/setup-python@v5
3737
with:
3838
python-version: ${{ matrix.python-version }}
3939
- name: Setup Test Env
@@ -66,7 +66,7 @@ jobs:
6666
run: |
6767
coverage combine .coverage*
6868
coverage xml -i
69-
- uses: codecov/codecov-action@v3
69+
- uses: codecov/codecov-action@v4
7070
with:
7171
token: ${{ secrets.CODECOV_TOKEN }}
7272
files: coverage.xml
@@ -84,8 +84,8 @@ jobs:
8484
# see https://github.com/actions/setup-python/issues/544#issuecomment-1332535877
8585
os: [ubuntu-20.04]
8686
steps:
87-
- uses: actions/checkout@v4
88-
- uses: actions/setup-python@v4
87+
- uses: actions/checkout@v4.1.1
88+
- uses: actions/setup-python@v5
8989
with:
9090
python-version: ${{ matrix.python-version }}
9191
- name: Setup Test Env
@@ -118,7 +118,7 @@ jobs:
118118
run: |
119119
coverage combine .coverage*
120120
coverage xml -i
121-
- uses: codecov/codecov-action@v3
121+
- uses: codecov/codecov-action@v4
122122
with:
123123
token: ${{ secrets.CODECOV_TOKEN }}
124124
files: coverage.xml

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

Lines changed: 22 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@ jobs:
5151
SENTRY_PYTHON_TEST_POSTGRES_NAME: ci_test
5252
SENTRY_PYTHON_TEST_POSTGRES_HOST: localhost
5353
steps:
54-
- uses: actions/checkout@v4
55-
- uses: actions/setup-python@v4
54+
- uses: actions/checkout@v4.1.1
55+
- uses: actions/setup-python@v5
5656
with:
5757
python-version: ${{ matrix.python-version }}
5858
- uses: getsentry/action-clickhouse-in-ci@v1
@@ -76,6 +76,14 @@ jobs:
7676
run: |
7777
set -x # print commands that are executed
7878
./scripts/runtox.sh "py${{ matrix.python-version }}-pymongo-latest" --cov=tests --cov=sentry_sdk --cov-report= --cov-branch
79+
- name: Test redis latest
80+
run: |
81+
set -x # print commands that are executed
82+
./scripts/runtox.sh "py${{ matrix.python-version }}-redis-latest" --cov=tests --cov=sentry_sdk --cov-report= --cov-branch
83+
- name: Test rediscluster latest
84+
run: |
85+
set -x # print commands that are executed
86+
./scripts/runtox.sh "py${{ matrix.python-version }}-rediscluster-latest" --cov=tests --cov=sentry_sdk --cov-report= --cov-branch
7987
- name: Test sqlalchemy latest
8088
run: |
8189
set -x # print commands that are executed
@@ -84,7 +92,7 @@ jobs:
8492
run: |
8593
coverage combine .coverage*
8694
coverage xml -i
87-
- uses: codecov/codecov-action@v3
95+
- uses: codecov/codecov-action@v4
8896
with:
8997
token: ${{ secrets.CODECOV_TOKEN }}
9098
files: coverage.xml
@@ -121,8 +129,8 @@ jobs:
121129
SENTRY_PYTHON_TEST_POSTGRES_NAME: ci_test
122130
SENTRY_PYTHON_TEST_POSTGRES_HOST: localhost
123131
steps:
124-
- uses: actions/checkout@v4
125-
- uses: actions/setup-python@v4
132+
- uses: actions/checkout@v4.1.1
133+
- uses: actions/setup-python@v5
126134
with:
127135
python-version: ${{ matrix.python-version }}
128136
- uses: getsentry/action-clickhouse-in-ci@v1
@@ -146,6 +154,14 @@ jobs:
146154
run: |
147155
set -x # print commands that are executed
148156
./scripts/runtox.sh --exclude-latest "py${{ matrix.python-version }}-pymongo" --cov=tests --cov=sentry_sdk --cov-report= --cov-branch
157+
- name: Test redis pinned
158+
run: |
159+
set -x # print commands that are executed
160+
./scripts/runtox.sh --exclude-latest "py${{ matrix.python-version }}-redis" --cov=tests --cov=sentry_sdk --cov-report= --cov-branch
161+
- name: Test rediscluster pinned
162+
run: |
163+
set -x # print commands that are executed
164+
./scripts/runtox.sh --exclude-latest "py${{ matrix.python-version }}-rediscluster" --cov=tests --cov=sentry_sdk --cov-report= --cov-branch
149165
- name: Test sqlalchemy pinned
150166
run: |
151167
set -x # print commands that are executed
@@ -154,7 +170,7 @@ jobs:
154170
run: |
155171
coverage combine .coverage*
156172
coverage xml -i
157-
- uses: codecov/codecov-action@v3
173+
- uses: codecov/codecov-action@v4
158174
with:
159175
token: ${{ secrets.CODECOV_TOKEN }}
160176
files: coverage.xml

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ jobs:
3232
# see https://github.com/actions/setup-python/issues/544#issuecomment-1332535877
3333
os: [ubuntu-20.04]
3434
steps:
35-
- uses: actions/checkout@v4
36-
- uses: actions/setup-python@v4
35+
- uses: actions/checkout@v4.1.1
36+
- uses: actions/setup-python@v5
3737
with:
3838
python-version: ${{ matrix.python-version }}
3939
- name: Setup Test Env
@@ -62,7 +62,7 @@ jobs:
6262
run: |
6363
coverage combine .coverage*
6464
coverage xml -i
65-
- uses: codecov/codecov-action@v3
65+
- uses: codecov/codecov-action@v4
6666
with:
6767
token: ${{ secrets.CODECOV_TOKEN }}
6868
files: coverage.xml
@@ -80,8 +80,8 @@ jobs:
8080
# see https://github.com/actions/setup-python/issues/544#issuecomment-1332535877
8181
os: [ubuntu-20.04]
8282
steps:
83-
- uses: actions/checkout@v4
84-
- uses: actions/setup-python@v4
83+
- uses: actions/checkout@v4.1.1
84+
- uses: actions/setup-python@v5
8585
with:
8686
python-version: ${{ matrix.python-version }}
8787
- name: Setup Test Env
@@ -110,7 +110,7 @@ jobs:
110110
run: |
111111
coverage combine .coverage*
112112
coverage xml -i
113-
- uses: codecov/codecov-action@v3
113+
- uses: codecov/codecov-action@v4
114114
with:
115115
token: ${{ secrets.CODECOV_TOKEN }}
116116
files: coverage.xml

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ jobs:
3232
# see https://github.com/actions/setup-python/issues/544#issuecomment-1332535877
3333
os: [ubuntu-20.04]
3434
steps:
35-
- uses: actions/checkout@v4
36-
- uses: actions/setup-python@v4
35+
- uses: actions/checkout@v4.1.1
36+
- uses: actions/setup-python@v5
3737
with:
3838
python-version: ${{ matrix.python-version }}
3939
- name: Setup Test Env
@@ -62,7 +62,7 @@ jobs:
6262
run: |
6363
coverage combine .coverage*
6464
coverage xml -i
65-
- uses: codecov/codecov-action@v3
65+
- uses: codecov/codecov-action@v4
6666
with:
6767
token: ${{ secrets.CODECOV_TOKEN }}
6868
files: coverage.xml
@@ -80,8 +80,8 @@ jobs:
8080
# see https://github.com/actions/setup-python/issues/544#issuecomment-1332535877
8181
os: [ubuntu-20.04]
8282
steps:
83-
- uses: actions/checkout@v4
84-
- uses: actions/setup-python@v4
83+
- uses: actions/checkout@v4.1.1
84+
- uses: actions/setup-python@v5
8585
with:
8686
python-version: ${{ matrix.python-version }}
8787
- name: Setup Test Env
@@ -110,7 +110,7 @@ jobs:
110110
run: |
111111
coverage combine .coverage*
112112
coverage xml -i
113-
- uses: codecov/codecov-action@v3
113+
- uses: codecov/codecov-action@v4
114114
with:
115115
token: ${{ secrets.CODECOV_TOKEN }}
116116
files: coverage.xml

0 commit comments

Comments
 (0)