diff --git a/.github/workflows/docker-matrix.yml b/.github/workflows/docker-matrix.yml index d1d25f9..0781fba 100644 --- a/.github/workflows/docker-matrix.yml +++ b/.github/workflows/docker-matrix.yml @@ -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 @@ -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 diff --git a/Dockerfile b/Dockerfile index 23e28f0..823fca5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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};