Skip to content

Commit 31f48e7

Browse files
committed
Merge branch 'potel-base' into antonpirker/potel/fix-celery
2 parents b20962b + ab5d8a7 commit 31f48e7

Some content is hidden

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

54 files changed

+623
-210
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55
branches:
66
- master
77
- release/**
8-
- sentry-sdk-2.0
8+
- potel-base
99

1010
pull_request:
1111

.github/workflows/codeql-analysis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ on:
1515
push:
1616
branches:
1717
- master
18-
- sentry-sdk-2.0
18+
- potel-base
1919
pull_request:
2020
schedule:
2121
- cron: '18 18 * * 3'

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
- master
77
- main
88
- release/*
9-
- sentry-sdk-2.0
9+
- potel-base
1010
pull_request:
1111

1212
# Cancel in progress workflows on pull_requests.

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88
branches:
99
- master
1010
- release/**
11-
- sentry-sdk-2.0
11+
- potel-base
1212
pull_request:
1313
# Cancel in progress workflows on pull_requests.
1414
# https://docs.github.com/en/actions/using-jobs/using-concurrency#example-using-a-fallback-value
@@ -30,7 +30,7 @@ jobs:
3030
fail-fast: false
3131
matrix:
3232
python-version: ["3.7","3.9","3.11","3.12","3.13"]
33-
os: [ubuntu-latest]
33+
os: [ubuntu-22.04]
3434
steps:
3535
- uses: actions/[email protected]
3636
- uses: actions/setup-python@v5
@@ -92,7 +92,7 @@ jobs:
9292
fail-fast: false
9393
matrix:
9494
python-version: ["3.8","3.9","3.11","3.12","3.13"]
95-
os: [ubuntu-latest]
95+
os: [ubuntu-22.04]
9696
steps:
9797
- uses: actions/[email protected]
9898
- uses: actions/setup-python@v5

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88
branches:
99
- master
1010
- release/**
11-
- sentry-sdk-2.0
11+
- potel-base
1212
# XXX: We are using `pull_request_target` instead of `pull_request` because we want
1313
# this to run on forks with access to the secrets necessary to run the test suite.
1414
# Prefer to use `pull_request` when possible.
@@ -62,7 +62,7 @@ jobs:
6262
fail-fast: false
6363
matrix:
6464
python-version: ["3.9"]
65-
os: [ubuntu-latest]
65+
os: [ubuntu-22.04]
6666
needs: check-permissions
6767
steps:
6868
- uses: actions/[email protected]

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88
branches:
99
- master
1010
- release/**
11-
- sentry-sdk-2.0
11+
- potel-base
1212
pull_request:
1313
# Cancel in progress workflows on pull_requests.
1414
# https://docs.github.com/en/actions/using-jobs/using-concurrency#example-using-a-fallback-value
@@ -30,7 +30,7 @@ jobs:
3030
fail-fast: false
3131
matrix:
3232
python-version: ["3.8","3.11","3.12","3.13"]
33-
os: [ubuntu-latest]
33+
os: [ubuntu-22.04]
3434
steps:
3535
- uses: actions/[email protected]
3636
- uses: actions/setup-python@v5
@@ -88,7 +88,7 @@ jobs:
8888
fail-fast: false
8989
matrix:
9090
python-version: ["3.7","3.9","3.11","3.12","3.13"]
91-
os: [ubuntu-latest]
91+
os: [ubuntu-22.04]
9292
steps:
9393
- uses: actions/[email protected]
9494
- uses: actions/setup-python@v5

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88
branches:
99
- master
1010
- release/**
11-
- sentry-sdk-2.0
11+
- potel-base
1212
pull_request:
1313
# Cancel in progress workflows on pull_requests.
1414
# https://docs.github.com/en/actions/using-jobs/using-concurrency#example-using-a-fallback-value
@@ -30,7 +30,7 @@ jobs:
3030
fail-fast: false
3131
matrix:
3232
python-version: ["3.7","3.8","3.9","3.10","3.11","3.12","3.13"]
33-
os: [ubuntu-latest]
33+
os: [ubuntu-22.04]
3434
steps:
3535
- uses: actions/[email protected]
3636
- uses: actions/setup-python@v5

.github/workflows/test-integrations-dbs.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88
branches:
99
- master
1010
- release/**
11-
- sentry-sdk-2.0
11+
- potel-base
1212
pull_request:
1313
# Cancel in progress workflows on pull_requests.
1414
# https://docs.github.com/en/actions/using-jobs/using-concurrency#example-using-a-fallback-value
@@ -30,7 +30,7 @@ jobs:
3030
fail-fast: false
3131
matrix:
3232
python-version: ["3.7","3.8","3.11","3.12","3.13"]
33-
os: [ubuntu-latest]
33+
os: [ubuntu-22.04]
3434
services:
3535
postgres:
3636
image: postgres
@@ -115,7 +115,7 @@ jobs:
115115
fail-fast: false
116116
matrix:
117117
python-version: ["3.7","3.8","3.9","3.10","3.11","3.12"]
118-
os: [ubuntu-latest]
118+
os: [ubuntu-22.04]
119119
services:
120120
postgres:
121121
image: postgres

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88
branches:
99
- master
1010
- release/**
11-
- sentry-sdk-2.0
11+
- potel-base
1212
pull_request:
1313
# Cancel in progress workflows on pull_requests.
1414
# https://docs.github.com/en/actions/using-jobs/using-concurrency#example-using-a-fallback-value
@@ -30,7 +30,7 @@ jobs:
3030
fail-fast: false
3131
matrix:
3232
python-version: ["3.7","3.8","3.12","3.13"]
33-
os: [ubuntu-latest]
33+
os: [ubuntu-22.04]
3434
steps:
3535
- uses: actions/[email protected]
3636
- uses: actions/setup-python@v5
@@ -88,7 +88,7 @@ jobs:
8888
fail-fast: false
8989
matrix:
9090
python-version: ["3.7","3.8","3.11","3.12"]
91-
os: [ubuntu-latest]
91+
os: [ubuntu-22.04]
9292
steps:
9393
- uses: actions/[email protected]
9494
- uses: actions/setup-python@v5

.github/workflows/test-integrations-misc.yml

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88
branches:
99
- master
1010
- release/**
11-
- sentry-sdk-2.0
11+
- potel-base
1212
pull_request:
1313
# Cancel in progress workflows on pull_requests.
1414
# https://docs.github.com/en/actions/using-jobs/using-concurrency#example-using-a-fallback-value
@@ -30,7 +30,7 @@ jobs:
3030
fail-fast: false
3131
matrix:
3232
python-version: ["3.7","3.8","3.12","3.13"]
33-
os: [ubuntu-latest]
33+
os: [ubuntu-22.04]
3434
steps:
3535
- uses: actions/[email protected]
3636
- uses: actions/setup-python@v5
@@ -75,6 +75,10 @@ jobs:
7575
run: |
7676
set -x # print commands that are executed
7777
./scripts/runtox.sh "py${{ matrix.python-version }}-typer-latest"
78+
- name: Test unleash latest
79+
run: |
80+
set -x # print commands that are executed
81+
./scripts/runtox.sh "py${{ matrix.python-version }}-unleash-latest"
7882
- name: Generate coverage XML
7983
if: ${{ !cancelled() }}
8084
run: |
@@ -104,7 +108,7 @@ jobs:
104108
fail-fast: false
105109
matrix:
106110
python-version: ["3.7","3.8","3.9","3.10","3.11","3.12","3.13"]
107-
os: [ubuntu-latest]
111+
os: [ubuntu-22.04]
108112
steps:
109113
- uses: actions/[email protected]
110114
- uses: actions/setup-python@v5
@@ -149,6 +153,10 @@ jobs:
149153
run: |
150154
set -x # print commands that are executed
151155
./scripts/runtox.sh --exclude-latest "py${{ matrix.python-version }}-typer"
156+
- name: Test unleash pinned
157+
run: |
158+
set -x # print commands that are executed
159+
./scripts/runtox.sh --exclude-latest "py${{ matrix.python-version }}-unleash"
152160
- name: Generate coverage XML
153161
if: ${{ !cancelled() }}
154162
run: |

0 commit comments

Comments
 (0)