Skip to content

Commit f1dd704

Browse files
committed
Fix version assignment syntax in CI workflows and Dockerfile
1 parent ea4dd3d commit f1dd704

3 files changed

Lines changed: 13 additions & 9 deletions

File tree

.github/workflows/deploy-dev-release.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ jobs:
199199
push: ${{ github.repository_owner == 'GRIDAPPSD' }}
200200
build-args: |
201201
PYTHON_VERSION=3.12
202-
GRIDAPPSD_PYTHON_VERSION==${{ env.NEW_VERSION }}
202+
GRIDAPPSD_PYTHON_VERSION=${{ env.NEW_VERSION }}
203203
tags: |
204204
${{ env.DOCKER_IMAGE }}:${{ env.NEW_VERSION }}
205205
${{ env.DOCKER_IMAGE }}:${{ env.NEW_VERSION }}-py312
@@ -216,7 +216,7 @@ jobs:
216216
push: ${{ github.repository_owner == 'GRIDAPPSD' }}
217217
build-args: |
218218
PYTHON_VERSION=3.10
219-
GRIDAPPSD_PYTHON_VERSION==${{ env.NEW_VERSION }}
219+
GRIDAPPSD_PYTHON_VERSION=${{ env.NEW_VERSION }}
220220
tags: |
221221
${{ env.DOCKER_IMAGE }}:${{ env.NEW_VERSION }}-py310
222222
platforms: linux/amd64,linux/arm64
@@ -231,7 +231,7 @@ jobs:
231231
push: ${{ github.repository_owner == 'GRIDAPPSD' }}
232232
build-args: |
233233
PYTHON_VERSION=3.11
234-
GRIDAPPSD_PYTHON_VERSION==${{ env.NEW_VERSION }}
234+
GRIDAPPSD_PYTHON_VERSION=${{ env.NEW_VERSION }}
235235
tags: |
236236
${{ env.DOCKER_IMAGE }}:${{ env.NEW_VERSION }}-py311
237237
platforms: linux/amd64,linux/arm64

.github/workflows/release.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ jobs:
143143
push: ${{ github.repository_owner == 'GRIDAPPSD' }}
144144
build-args: |
145145
PYTHON_VERSION=3.12
146-
GRIDAPPSD_PYTHON_VERSION==${{ env.VERSION }}
146+
GRIDAPPSD_PYTHON_VERSION=${{ env.VERSION }}
147147
tags: |
148148
${{ env.DOCKER_IMAGE }}:${{ env.VERSION }}
149149
${{ env.DOCKER_IMAGE }}:${{ env.VERSION }}-py312
@@ -160,7 +160,7 @@ jobs:
160160
push: ${{ github.repository_owner == 'GRIDAPPSD' }}
161161
build-args: |
162162
PYTHON_VERSION=3.10
163-
GRIDAPPSD_PYTHON_VERSION==${{ env.VERSION }}
163+
GRIDAPPSD_PYTHON_VERSION=${{ env.VERSION }}
164164
tags: |
165165
${{ env.DOCKER_IMAGE }}:${{ env.VERSION }}-py310
166166
platforms: linux/amd64,linux/arm64
@@ -175,7 +175,7 @@ jobs:
175175
push: ${{ github.repository_owner == 'GRIDAPPSD' }}
176176
build-args: |
177177
PYTHON_VERSION=3.11
178-
GRIDAPPSD_PYTHON_VERSION==${{ env.VERSION }}
178+
GRIDAPPSD_PYTHON_VERSION=${{ env.VERSION }}
179179
tags: |
180180
${{ env.DOCKER_IMAGE }}:${{ env.VERSION }}-py311
181181
platforms: linux/amd64,linux/arm64

Dockerfile

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,11 +61,15 @@ RUN apt-get update \
6161
WORKDIR /app
6262

6363
# Install gridappsd-python
64-
# If GRIDAPPSD_PYTHON_VERSION is set (e.g., "==2025.3.2"), use it
64+
# If GRIDAPPSD_PYTHON_VERSION is set (e.g., "2025.3.2"), install that exact version
6565
# Otherwise install latest from PyPI
66-
# --pre allows installing prerelease versions (e.g., 2025.3.2a15)
66+
# --pre allows installing prerelease versions (e.g., 2025.3.2a17)
6767
RUN pip install --upgrade pip \
68-
&& pip install --pre gridappsd-python${GRIDAPPSD_PYTHON_VERSION:-}
68+
&& if [ -n "$GRIDAPPSD_PYTHON_VERSION" ]; then \
69+
pip install --pre "gridappsd-python==$GRIDAPPSD_PYTHON_VERSION"; \
70+
else \
71+
pip install --pre gridappsd-python; \
72+
fi
6973

7074
# Default command shows installed version
7175
CMD ["python", "-c", "import gridappsd; print(f'gridappsd-python version: {gridappsd.__version__}')"]

0 commit comments

Comments
 (0)