Skip to content

Commit

Permalink
Make update a default, without update. It's not adding anything
Browse files Browse the repository at this point in the history
  • Loading branch information
cscollett committed Aug 29, 2024
1 parent 5f44770 commit b19d37a
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 13 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/docker-matrix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
fail-fast: false
matrix:
image-tag: ['3.12-slim-bullseye', '3.13.0rc1', '3.13.0rc1-slim', 'latest']
update-strategy: [update, unlocked-install, latest-install]
update-strategy: [locked-install, unlocked-install, latest-install]

steps:
- name: Checkout code
Expand All @@ -29,10 +29,10 @@ jobs:
echo "Image tag: ${{ matrix.image-tag }}"
echo "Update strategy: ${{ matrix.update-strategy }}"
if [[ "${{ matrix.update-strategy }}" == "update" ]]; then
if [[ "${{ matrix.update-strategy }}" == "locked-install" ]]; then
echo "Running normal test with updated dependencies"
docker build --no-cache --build-arg IMAGE_TAG=${{ matrix.image-tag }} --target test-update -t zephir-api2:test .
docker build --no-cache --build-arg IMAGE_TAG=${{ matrix.image-tag }} --target test -t zephir-api2:test .
elif [[ "${{ matrix.update-strategy }}" == "unlocked-install" ]]; then
Expand Down
10 changes: 0 additions & 10 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -51,16 +51,6 @@ USER app
RUN poetry run pytest tests
RUN poetry run pip list

FROM build AS test-update
# Install dev dependencies
RUN poetry install --only dev --no-root && rm -rf ${POETRY_CACHE_DIR};
RUN poetry update
COPY . .
# Run tests
USER app
RUN poetry run pytest tests
RUN poetry run pip list

FROM poetry AS build-unlocked-test
COPY pyproject.toml ./
RUN poetry install --no-root && rm -rf ${POETRY_CACHE_DIR};
Expand Down

0 comments on commit b19d37a

Please sign in to comment.