Skip to content

Commit c634e7a

Browse files
antonpirkerantonpirker
committed
Do 3.6 and 3.7 in a container to make it work for a couple of years.
1 parent 1b20d18 commit c634e7a

14 files changed

+67
-147
lines changed

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

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -30,17 +30,13 @@ jobs:
3030
fail-fast: false
3131
matrix:
3232
python-version: ["3.7","3.9","3.11","3.12"]
33-
# python3.6 reached EOL and is no longer being supported on
34-
# new versions of hosted runners on Github Actions
35-
# ubuntu-20.04 is the last version that supported python3.6
36-
# see https://github.com/actions/setup-python/issues/544#issuecomment-1332535877
3733
os: [ubuntu-24.04]
38-
# Use Docker container only for Python 3.6
39-
container: ${{ matrix.python-version == '3.6' && 'python:3.6' || null }}
34+
# Use Docker container only for Python 3.6 and 3.7
35+
container: ${{ (matrix.python-version == '3.6' || matrix.python-version == '3.7') && 'python:${{ matrix.python-version }}' || null }}
4036
steps:
4137
- uses: actions/[email protected]
4238
- uses: actions/setup-python@v5
43-
if: ${{ matrix.python-version != '3.6' }}
39+
if: ${{ (matrix.python-version == '3.6' || matrix.python-version == '3.7') }}
4440
with:
4541
python-version: ${{ matrix.python-version }}
4642
allow-prereleases: true
@@ -105,17 +101,13 @@ jobs:
105101
fail-fast: false
106102
matrix:
107103
python-version: ["3.8","3.9","3.11","3.12"]
108-
# python3.6 reached EOL and is no longer being supported on
109-
# new versions of hosted runners on Github Actions
110-
# ubuntu-20.04 is the last version that supported python3.6
111-
# see https://github.com/actions/setup-python/issues/544#issuecomment-1332535877
112104
os: [ubuntu-24.04]
113-
# Use Docker container only for Python 3.6
114-
container: ${{ matrix.python-version == '3.6' && 'python:3.6' || null }}
105+
# Use Docker container only for Python 3.6 and 3.7
106+
container: ${{ (matrix.python-version == '3.6' || matrix.python-version == '3.7') && 'python:${{ matrix.python-version }}' || null }}
115107
steps:
116108
- uses: actions/[email protected]
117109
- uses: actions/setup-python@v5
118-
if: ${{ matrix.python-version != '3.6' }}
110+
if: ${{ (matrix.python-version == '3.6' || matrix.python-version == '3.7') }}
119111
with:
120112
python-version: ${{ matrix.python-version }}
121113
allow-prereleases: true

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

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -30,21 +30,17 @@ jobs:
3030
fail-fast: false
3131
matrix:
3232
python-version: ["3.8","3.11","3.12","3.13"]
33-
# python3.6 reached EOL and is no longer being supported on
34-
# new versions of hosted runners on Github Actions
35-
# ubuntu-20.04 is the last version that supported python3.6
36-
# see https://github.com/actions/setup-python/issues/544#issuecomment-1332535877
3733
os: [ubuntu-24.04]
3834
services:
3935
docker:
4036
image: docker:dind # Required for Docker network management
4137
options: --privileged # Required for Docker-in-Docker operations
42-
# Use Docker container only for Python 3.6
43-
container: ${{ matrix.python-version == '3.6' && 'python:3.6' || null }}
38+
# Use Docker container only for Python 3.6 and 3.7
39+
container: ${{ (matrix.python-version == '3.6' || matrix.python-version == '3.7') && 'python:${{ matrix.python-version }}' || null }}
4440
steps:
4541
- uses: actions/[email protected]
4642
- uses: actions/setup-python@v5
47-
if: ${{ matrix.python-version != '3.6' }}
43+
if: ${{ (matrix.python-version == '3.6' || matrix.python-version == '3.7') }}
4844
with:
4945
python-version: ${{ matrix.python-version }}
5046
allow-prereleases: true
@@ -109,21 +105,17 @@ jobs:
109105
fail-fast: false
110106
matrix:
111107
python-version: ["3.6","3.7","3.8","3.9","3.11","3.12","3.13"]
112-
# python3.6 reached EOL and is no longer being supported on
113-
# new versions of hosted runners on Github Actions
114-
# ubuntu-20.04 is the last version that supported python3.6
115-
# see https://github.com/actions/setup-python/issues/544#issuecomment-1332535877
116108
os: [ubuntu-24.04]
117109
services:
118110
docker:
119111
image: docker:dind # Required for Docker network management
120112
options: --privileged # Required for Docker-in-Docker operations
121-
# Use Docker container only for Python 3.6
122-
container: ${{ matrix.python-version == '3.6' && 'python:3.6' || null }}
113+
# Use Docker container only for Python 3.6 and 3.7
114+
container: ${{ (matrix.python-version == '3.6' || matrix.python-version == '3.7') && 'python:${{ matrix.python-version }}' || null }}
123115
steps:
124116
- uses: actions/[email protected]
125117
- uses: actions/setup-python@v5
126-
if: ${{ matrix.python-version != '3.6' }}
118+
if: ${{ (matrix.python-version == '3.6' || matrix.python-version == '3.7') }}
127119
with:
128120
python-version: ${{ matrix.python-version }}
129121
allow-prereleases: true

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

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,17 +30,13 @@ jobs:
3030
fail-fast: false
3131
matrix:
3232
python-version: ["3.6","3.7","3.8","3.9","3.10","3.11","3.12","3.13"]
33-
# python3.6 reached EOL and is no longer being supported on
34-
# new versions of hosted runners on Github Actions
35-
# ubuntu-20.04 is the last version that supported python3.6
36-
# see https://github.com/actions/setup-python/issues/544#issuecomment-1332535877
3733
os: [ubuntu-24.04]
38-
# Use Docker container only for Python 3.6
39-
container: ${{ matrix.python-version == '3.6' && 'python:3.6' || null }}
34+
# Use Docker container only for Python 3.6 and 3.7
35+
container: ${{ (matrix.python-version == '3.6' || matrix.python-version == '3.7') && 'python:${{ matrix.python-version }}' || null }}
4036
steps:
4137
- uses: actions/[email protected]
4238
- uses: actions/setup-python@v5
43-
if: ${{ matrix.python-version != '3.6' }}
39+
if: ${{ (matrix.python-version == '3.6' || matrix.python-version == '3.7') }}
4440
with:
4541
python-version: ${{ matrix.python-version }}
4642
allow-prereleases: true

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

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,6 @@ jobs:
3030
fail-fast: false
3131
matrix:
3232
python-version: ["3.7","3.8","3.11","3.12","3.13"]
33-
# python3.6 reached EOL and is no longer being supported on
34-
# new versions of hosted runners on Github Actions
35-
# ubuntu-20.04 is the last version that supported python3.6
36-
# see https://github.com/actions/setup-python/issues/544#issuecomment-1332535877
3733
os: [ubuntu-24.04]
3834
services:
3935
postgres:
@@ -50,15 +46,15 @@ jobs:
5046
ports:
5147
- 5432:5432
5248
env:
53-
SENTRY_PYTHON_TEST_POSTGRES_HOST: ${{ matrix.python-version == '3.6' && 'postgres' || 'localhost' }}
49+
SENTRY_PYTHON_TEST_POSTGRES_HOST: ${{ (matrix.python-version == '3.6' || matrix.python-version == '3.7') && 'postgres' || 'localhost' }}
5450
SENTRY_PYTHON_TEST_POSTGRES_USER: postgres
5551
SENTRY_PYTHON_TEST_POSTGRES_PASSWORD: sentry
56-
# Use Docker container only for Python 3.6
57-
container: ${{ matrix.python-version == '3.6' && 'python:3.6' || null }}
52+
# Use Docker container only for Python 3.6 and 3.7
53+
container: ${{ (matrix.python-version == '3.6' || matrix.python-version == '3.7') && 'python:${{ matrix.python-version }}' || null }}
5854
steps:
5955
- uses: actions/[email protected]
6056
- uses: actions/setup-python@v5
61-
if: ${{ matrix.python-version != '3.6' }}
57+
if: ${{ (matrix.python-version == '3.6' || matrix.python-version == '3.7') }}
6258
with:
6359
python-version: ${{ matrix.python-version }}
6460
allow-prereleases: true
@@ -129,10 +125,6 @@ jobs:
129125
fail-fast: false
130126
matrix:
131127
python-version: ["3.6","3.7","3.8","3.9","3.10","3.11","3.12","3.13"]
132-
# python3.6 reached EOL and is no longer being supported on
133-
# new versions of hosted runners on Github Actions
134-
# ubuntu-20.04 is the last version that supported python3.6
135-
# see https://github.com/actions/setup-python/issues/544#issuecomment-1332535877
136128
os: [ubuntu-24.04]
137129
services:
138130
postgres:
@@ -149,15 +141,15 @@ jobs:
149141
ports:
150142
- 5432:5432
151143
env:
152-
SENTRY_PYTHON_TEST_POSTGRES_HOST: ${{ matrix.python-version == '3.6' && 'postgres' || 'localhost' }}
144+
SENTRY_PYTHON_TEST_POSTGRES_HOST: ${{ (matrix.python-version == '3.6' || matrix.python-version == '3.7') && 'postgres' || 'localhost' }}
153145
SENTRY_PYTHON_TEST_POSTGRES_USER: postgres
154146
SENTRY_PYTHON_TEST_POSTGRES_PASSWORD: sentry
155-
# Use Docker container only for Python 3.6
156-
container: ${{ matrix.python-version == '3.6' && 'python:3.6' || null }}
147+
# Use Docker container only for Python 3.6 and 3.7
148+
container: ${{ (matrix.python-version == '3.6' || matrix.python-version == '3.7') && 'python:${{ matrix.python-version }}' || null }}
157149
steps:
158150
- uses: actions/[email protected]
159151
- uses: actions/setup-python@v5
160-
if: ${{ matrix.python-version != '3.6' }}
152+
if: ${{ (matrix.python-version == '3.6' || matrix.python-version == '3.7') }}
161153
with:
162154
python-version: ${{ matrix.python-version }}
163155
allow-prereleases: true

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

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,17 +30,13 @@ jobs:
3030
fail-fast: false
3131
matrix:
3232
python-version: ["3.7","3.8","3.9","3.12","3.13"]
33-
# python3.6 reached EOL and is no longer being supported on
34-
# new versions of hosted runners on Github Actions
35-
# ubuntu-20.04 is the last version that supported python3.6
36-
# see https://github.com/actions/setup-python/issues/544#issuecomment-1332535877
3733
os: [ubuntu-24.04]
38-
# Use Docker container only for Python 3.6
39-
container: ${{ matrix.python-version == '3.6' && 'python:3.6' || null }}
34+
# Use Docker container only for Python 3.6 and 3.7
35+
container: ${{ (matrix.python-version == '3.6' || matrix.python-version == '3.7') && 'python:${{ matrix.python-version }}' || null }}
4036
steps:
4137
- uses: actions/[email protected]
4238
- uses: actions/setup-python@v5
43-
if: ${{ matrix.python-version != '3.6' }}
39+
if: ${{ (matrix.python-version == '3.6' || matrix.python-version == '3.7') }}
4440
with:
4541
python-version: ${{ matrix.python-version }}
4642
allow-prereleases: true

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

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,17 +30,13 @@ jobs:
3030
fail-fast: false
3131
matrix:
3232
python-version: ["3.6","3.8","3.10","3.11","3.12"]
33-
# python3.6 reached EOL and is no longer being supported on
34-
# new versions of hosted runners on Github Actions
35-
# ubuntu-20.04 is the last version that supported python3.6
36-
# see https://github.com/actions/setup-python/issues/544#issuecomment-1332535877
3733
os: [ubuntu-24.04]
38-
# Use Docker container only for Python 3.6
39-
container: ${{ matrix.python-version == '3.6' && 'python:3.6' || null }}
34+
# Use Docker container only for Python 3.6 and 3.7
35+
container: ${{ (matrix.python-version == '3.6' || matrix.python-version == '3.7') && 'python:${{ matrix.python-version }}' || null }}
4036
steps:
4137
- uses: actions/[email protected]
4238
- uses: actions/setup-python@v5
43-
if: ${{ matrix.python-version != '3.6' }}
39+
if: ${{ (matrix.python-version == '3.6' || matrix.python-version == '3.7') }}
4440
with:
4541
python-version: ${{ matrix.python-version }}
4642
allow-prereleases: true

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

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,17 +30,13 @@ jobs:
3030
fail-fast: false
3131
matrix:
3232
python-version: ["3.6","3.7","3.8","3.9","3.10","3.11","3.12","3.13"]
33-
# python3.6 reached EOL and is no longer being supported on
34-
# new versions of hosted runners on Github Actions
35-
# ubuntu-20.04 is the last version that supported python3.6
36-
# see https://github.com/actions/setup-python/issues/544#issuecomment-1332535877
3733
os: [ubuntu-24.04]
38-
# Use Docker container only for Python 3.6
39-
container: ${{ matrix.python-version == '3.6' && 'python:3.6' || null }}
34+
# Use Docker container only for Python 3.6 and 3.7
35+
container: ${{ (matrix.python-version == '3.6' || matrix.python-version == '3.7') && 'python:${{ matrix.python-version }}' || null }}
4036
steps:
4137
- uses: actions/[email protected]
4238
- uses: actions/setup-python@v5
43-
if: ${{ matrix.python-version != '3.6' }}
39+
if: ${{ (matrix.python-version == '3.6' || matrix.python-version == '3.7') }}
4440
with:
4541
python-version: ${{ matrix.python-version }}
4642
allow-prereleases: true

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

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,17 +30,13 @@ jobs:
3030
fail-fast: false
3131
matrix:
3232
python-version: ["3.6","3.7","3.8","3.9","3.10","3.11","3.12","3.13"]
33-
# python3.6 reached EOL and is no longer being supported on
34-
# new versions of hosted runners on Github Actions
35-
# ubuntu-20.04 is the last version that supported python3.6
36-
# see https://github.com/actions/setup-python/issues/544#issuecomment-1332535877
3733
os: [ubuntu-24.04]
38-
# Use Docker container only for Python 3.6
39-
container: ${{ matrix.python-version == '3.6' && 'python:3.6' || null }}
34+
# Use Docker container only for Python 3.6 and 3.7
35+
container: ${{ (matrix.python-version == '3.6' || matrix.python-version == '3.7') && 'python:${{ matrix.python-version }}' || null }}
4036
steps:
4137
- uses: actions/[email protected]
4238
- uses: actions/setup-python@v5
43-
if: ${{ matrix.python-version != '3.6' }}
39+
if: ${{ (matrix.python-version == '3.6' || matrix.python-version == '3.7') }}
4440
with:
4541
python-version: ${{ matrix.python-version }}
4642
allow-prereleases: true

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

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -30,17 +30,13 @@ jobs:
3030
fail-fast: false
3131
matrix:
3232
python-version: ["3.9","3.12","3.13"]
33-
# python3.6 reached EOL and is no longer being supported on
34-
# new versions of hosted runners on Github Actions
35-
# ubuntu-20.04 is the last version that supported python3.6
36-
# see https://github.com/actions/setup-python/issues/544#issuecomment-1332535877
3733
os: [ubuntu-24.04]
38-
# Use Docker container only for Python 3.6
39-
container: ${{ matrix.python-version == '3.6' && 'python:3.6' || null }}
34+
# Use Docker container only for Python 3.6 and 3.7
35+
container: ${{ (matrix.python-version == '3.6' || matrix.python-version == '3.7') && 'python:${{ matrix.python-version }}' || null }}
4036
steps:
4137
- uses: actions/[email protected]
4238
- uses: actions/setup-python@v5
43-
if: ${{ matrix.python-version != '3.6' }}
39+
if: ${{ (matrix.python-version == '3.6' || matrix.python-version == '3.7') }}
4440
with:
4541
python-version: ${{ matrix.python-version }}
4642
allow-prereleases: true
@@ -97,17 +93,13 @@ jobs:
9793
fail-fast: false
9894
matrix:
9995
python-version: ["3.6","3.7","3.8","3.9","3.10","3.11","3.12","3.13"]
100-
# python3.6 reached EOL and is no longer being supported on
101-
# new versions of hosted runners on Github Actions
102-
# ubuntu-20.04 is the last version that supported python3.6
103-
# see https://github.com/actions/setup-python/issues/544#issuecomment-1332535877
10496
os: [ubuntu-24.04]
105-
# Use Docker container only for Python 3.6
106-
container: ${{ matrix.python-version == '3.6' && 'python:3.6' || null }}
97+
# Use Docker container only for Python 3.6 and 3.7
98+
container: ${{ (matrix.python-version == '3.6' || matrix.python-version == '3.7') && 'python:${{ matrix.python-version }}' || null }}
10799
steps:
108100
- uses: actions/[email protected]
109101
- uses: actions/setup-python@v5
110-
if: ${{ matrix.python-version != '3.6' }}
102+
if: ${{ (matrix.python-version == '3.6' || matrix.python-version == '3.7') }}
111103
with:
112104
python-version: ${{ matrix.python-version }}
113105
allow-prereleases: true

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

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ env:
2121
BUILD_CACHE_KEY: ${{ github.sha }}
2222
CACHED_BUILD_PATHS: |
2323
${{ github.workspace }}/dist-serverless
24-
CELERY_BROKER_URL: ${{ matrix.python-version == '3.6' && 'redis://redis:6379/0' || 'redis://localhost:6379/0' }}
24+
CELERY_BROKER_URL: ${{ (matrix.python-version == '3.6' || matrix.python-version == '3.7') && 'redis://redis:6379/0' || 'redis://localhost:6379/0' }}
2525
jobs:
2626
test-tasks-latest:
2727
name: Tasks (latest)
@@ -31,17 +31,13 @@ jobs:
3131
fail-fast: false
3232
matrix:
3333
python-version: ["3.7","3.8","3.10","3.11","3.12","3.13"]
34-
# python3.6 reached EOL and is no longer being supported on
35-
# new versions of hosted runners on Github Actions
36-
# ubuntu-20.04 is the last version that supported python3.6
37-
# see https://github.com/actions/setup-python/issues/544#issuecomment-1332535877
3834
os: [ubuntu-24.04]
39-
# Use Docker container only for Python 3.6
40-
container: ${{ matrix.python-version == '3.6' && 'python:3.6' || null }}
35+
# Use Docker container only for Python 3.6 and 3.7
36+
container: ${{ (matrix.python-version == '3.6' || matrix.python-version == '3.7') && 'python:${{ matrix.python-version }}' || null }}
4137
steps:
4238
- uses: actions/[email protected]
4339
- uses: actions/setup-python@v5
44-
if: ${{ matrix.python-version != '3.6' }}
40+
if: ${{ (matrix.python-version == '3.6' || matrix.python-version == '3.7') }}
4541
with:
4642
python-version: ${{ matrix.python-version }}
4743
allow-prereleases: true
@@ -120,17 +116,13 @@ jobs:
120116
fail-fast: false
121117
matrix:
122118
python-version: ["3.6","3.7","3.8","3.9","3.10","3.11","3.12","3.13"]
123-
# python3.6 reached EOL and is no longer being supported on
124-
# new versions of hosted runners on Github Actions
125-
# ubuntu-20.04 is the last version that supported python3.6
126-
# see https://github.com/actions/setup-python/issues/544#issuecomment-1332535877
127119
os: [ubuntu-24.04]
128-
# Use Docker container only for Python 3.6
129-
container: ${{ matrix.python-version == '3.6' && 'python:3.6' || null }}
120+
# Use Docker container only for Python 3.6 and 3.7
121+
container: ${{ (matrix.python-version == '3.6' || matrix.python-version == '3.7') && 'python:${{ matrix.python-version }}' || null }}
130122
steps:
131123
- uses: actions/[email protected]
132124
- uses: actions/setup-python@v5
133-
if: ${{ matrix.python-version != '3.6' }}
125+
if: ${{ (matrix.python-version == '3.6' || matrix.python-version == '3.7') }}
134126
with:
135127
python-version: ${{ matrix.python-version }}
136128
allow-prereleases: true

0 commit comments

Comments
 (0)