Skip to content

Commit 6aa7ceb

Browse files
committed
Fix docker container name
1 parent c634e7a commit 6aa7ceb

13 files changed

+20
-20
lines changed

Diff for: .github/workflows/test-integrations-ai.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
python-version: ["3.7","3.9","3.11","3.12"]
3333
os: [ubuntu-24.04]
3434
# 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 }}
35+
container: ${{ (matrix.python-version == '3.6' || matrix.python-version == '3.7') && format('python:{0}', matrix.python-version) || null }}
3636
steps:
3737
- uses: actions/[email protected]
3838
- uses: actions/setup-python@v5
@@ -103,7 +103,7 @@ jobs:
103103
python-version: ["3.8","3.9","3.11","3.12"]
104104
os: [ubuntu-24.04]
105105
# 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 }}
106+
container: ${{ (matrix.python-version == '3.6' || matrix.python-version == '3.7') && format('python:{0}', matrix.python-version) || null }}
107107
steps:
108108
- uses: actions/[email protected]
109109
- uses: actions/setup-python@v5

Diff for: .github/workflows/test-integrations-cloud.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
image: docker:dind # Required for Docker network management
3737
options: --privileged # Required for Docker-in-Docker operations
3838
# 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 }}
39+
container: ${{ (matrix.python-version == '3.6' || matrix.python-version == '3.7') && format('python:{0}', matrix.python-version) || null }}
4040
steps:
4141
- uses: actions/[email protected]
4242
- uses: actions/setup-python@v5
@@ -111,7 +111,7 @@ jobs:
111111
image: docker:dind # Required for Docker network management
112112
options: --privileged # Required for Docker-in-Docker operations
113113
# 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 }}
114+
container: ${{ (matrix.python-version == '3.6' || matrix.python-version == '3.7') && format('python:{0}', matrix.python-version) || null }}
115115
steps:
116116
- uses: actions/[email protected]
117117
- uses: actions/setup-python@v5

Diff for: .github/workflows/test-integrations-common.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
python-version: ["3.6","3.7","3.8","3.9","3.10","3.11","3.12","3.13"]
3333
os: [ubuntu-24.04]
3434
# 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 }}
35+
container: ${{ (matrix.python-version == '3.6' || matrix.python-version == '3.7') && format('python:{0}', matrix.python-version) || null }}
3636
steps:
3737
- uses: actions/[email protected]
3838
- uses: actions/setup-python@v5

Diff for: .github/workflows/test-integrations-dbs.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050
SENTRY_PYTHON_TEST_POSTGRES_USER: postgres
5151
SENTRY_PYTHON_TEST_POSTGRES_PASSWORD: sentry
5252
# 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 }}
53+
container: ${{ (matrix.python-version == '3.6' || matrix.python-version == '3.7') && format('python:{0}', matrix.python-version) || null }}
5454
steps:
5555
- uses: actions/[email protected]
5656
- uses: actions/setup-python@v5
@@ -145,7 +145,7 @@ jobs:
145145
SENTRY_PYTHON_TEST_POSTGRES_USER: postgres
146146
SENTRY_PYTHON_TEST_POSTGRES_PASSWORD: sentry
147147
# 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 }}
148+
container: ${{ (matrix.python-version == '3.6' || matrix.python-version == '3.7') && format('python:{0}', matrix.python-version) || null }}
149149
steps:
150150
- uses: actions/[email protected]
151151
- uses: actions/setup-python@v5

Diff for: .github/workflows/test-integrations-flags.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
python-version: ["3.7","3.8","3.9","3.12","3.13"]
3333
os: [ubuntu-24.04]
3434
# 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 }}
35+
container: ${{ (matrix.python-version == '3.6' || matrix.python-version == '3.7') && format('python:{0}', matrix.python-version) || null }}
3636
steps:
3737
- uses: actions/[email protected]
3838
- uses: actions/setup-python@v5

Diff for: .github/workflows/test-integrations-gevent.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
python-version: ["3.6","3.8","3.10","3.11","3.12"]
3333
os: [ubuntu-24.04]
3434
# 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 }}
35+
container: ${{ (matrix.python-version == '3.6' || matrix.python-version == '3.7') && format('python:{0}', matrix.python-version) || null }}
3636
steps:
3737
- uses: actions/[email protected]
3838
- uses: actions/setup-python@v5

Diff for: .github/workflows/test-integrations-graphql.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
python-version: ["3.6","3.7","3.8","3.9","3.10","3.11","3.12","3.13"]
3333
os: [ubuntu-24.04]
3434
# 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 }}
35+
container: ${{ (matrix.python-version == '3.6' || matrix.python-version == '3.7') && format('python:{0}', matrix.python-version) || null }}
3636
steps:
3737
- uses: actions/[email protected]
3838
- uses: actions/setup-python@v5

Diff for: .github/workflows/test-integrations-misc.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
python-version: ["3.6","3.7","3.8","3.9","3.10","3.11","3.12","3.13"]
3333
os: [ubuntu-24.04]
3434
# 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 }}
35+
container: ${{ (matrix.python-version == '3.6' || matrix.python-version == '3.7') && format('python:{0}', matrix.python-version) || null }}
3636
steps:
3737
- uses: actions/[email protected]
3838
- uses: actions/setup-python@v5

Diff for: .github/workflows/test-integrations-network.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
python-version: ["3.9","3.12","3.13"]
3333
os: [ubuntu-24.04]
3434
# 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 }}
35+
container: ${{ (matrix.python-version == '3.6' || matrix.python-version == '3.7') && format('python:{0}', matrix.python-version) || null }}
3636
steps:
3737
- uses: actions/[email protected]
3838
- uses: actions/setup-python@v5
@@ -95,7 +95,7 @@ jobs:
9595
python-version: ["3.6","3.7","3.8","3.9","3.10","3.11","3.12","3.13"]
9696
os: [ubuntu-24.04]
9797
# 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 }}
98+
container: ${{ (matrix.python-version == '3.6' || matrix.python-version == '3.7') && format('python:{0}', matrix.python-version) || null }}
9999
steps:
100100
- uses: actions/[email protected]
101101
- uses: actions/setup-python@v5

Diff for: .github/workflows/test-integrations-tasks.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
python-version: ["3.7","3.8","3.10","3.11","3.12","3.13"]
3434
os: [ubuntu-24.04]
3535
# 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 }}
36+
container: ${{ (matrix.python-version == '3.6' || matrix.python-version == '3.7') && format('python:{0}', matrix.python-version) || null }}
3737
steps:
3838
- uses: actions/[email protected]
3939
- uses: actions/setup-python@v5
@@ -118,7 +118,7 @@ jobs:
118118
python-version: ["3.6","3.7","3.8","3.9","3.10","3.11","3.12","3.13"]
119119
os: [ubuntu-24.04]
120120
# 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 }}
121+
container: ${{ (matrix.python-version == '3.6' || matrix.python-version == '3.7') && format('python:{0}', matrix.python-version) || null }}
122122
steps:
123123
- uses: actions/[email protected]
124124
- uses: actions/setup-python@v5

Diff for: .github/workflows/test-integrations-web-1.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050
SENTRY_PYTHON_TEST_POSTGRES_USER: postgres
5151
SENTRY_PYTHON_TEST_POSTGRES_PASSWORD: sentry
5252
# 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 }}
53+
container: ${{ (matrix.python-version == '3.6' || matrix.python-version == '3.7') && format('python:{0}', matrix.python-version) || null }}
5454
steps:
5555
- uses: actions/[email protected]
5656
- uses: actions/setup-python@v5
@@ -135,7 +135,7 @@ jobs:
135135
SENTRY_PYTHON_TEST_POSTGRES_USER: postgres
136136
SENTRY_PYTHON_TEST_POSTGRES_PASSWORD: sentry
137137
# Use Docker container only for Python 3.6 and 3.7
138-
container: ${{ (matrix.python-version == '3.6' || matrix.python-version == '3.7') && 'python:${{ matrix.python-version }}' || null }}
138+
container: ${{ (matrix.python-version == '3.6' || matrix.python-version == '3.7') && format('python:{0}', matrix.python-version) || null }}
139139
steps:
140140
- uses: actions/[email protected]
141141
- uses: actions/setup-python@v5

Diff for: .github/workflows/test-integrations-web-2.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
python-version: ["3.8","3.9","3.12","3.13"]
3333
os: [ubuntu-24.04]
3434
# 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 }}
35+
container: ${{ (matrix.python-version == '3.6' || matrix.python-version == '3.7') && format('python:{0}', matrix.python-version) || null }}
3636
steps:
3737
- uses: actions/[email protected]
3838
- uses: actions/setup-python@v5
@@ -123,7 +123,7 @@ jobs:
123123
python-version: ["3.6","3.7","3.8","3.9","3.10","3.11","3.12","3.13"]
124124
os: [ubuntu-24.04]
125125
# Use Docker container only for Python 3.6 and 3.7
126-
container: ${{ (matrix.python-version == '3.6' || matrix.python-version == '3.7') && 'python:${{ matrix.python-version }}' || null }}
126+
container: ${{ (matrix.python-version == '3.6' || matrix.python-version == '3.7') && format('python:{0}', matrix.python-version) || null }}
127127
steps:
128128
- uses: actions/[email protected]
129129
- uses: actions/setup-python@v5

Diff for: scripts/split_tox_gh_actions/templates/test_group.jinja

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636

3737
{% endif %}
3838
# Use Docker container only for Python 3.6 and 3.7
39-
{% raw %}container: ${{ (matrix.python-version == '3.6' || matrix.python-version == '3.7') && 'python:${{ matrix.python-version }}' || null }}{% endraw %}
39+
{% raw %}container: ${{ (matrix.python-version == '3.6' || matrix.python-version == '3.7') && format('python:{0}', matrix.python-version) || null }}{% endraw %}
4040
steps:
4141
- uses: actions/[email protected]
4242
- uses: actions/setup-python@v5

0 commit comments

Comments
 (0)