diff --git a/.github/workflows/development.yaml b/.github/workflows/development.yaml index bb1f9e17..08dd3e19 100644 --- a/.github/workflows/development.yaml +++ b/.github/workflows/development.yaml @@ -42,7 +42,7 @@ jobs: - name: Build pip artifacts run: | export HOST_UID=$(id -u) - docker-compose -f docker-compose-build.yaml up --exit-code-from app --build + docker compose -f docker-compose-build.yaml up --exit-code-from app --build echo "DJ_VERSION=${DJ_VERSION}" >> $GITHUB_ENV - if: matrix.py_ver == '3.9' && matrix.distro == 'debian' name: Add pip artifacts @@ -89,7 +89,7 @@ jobs: COMPOSE_HTTP_TIMEOUT: "120" run: | export HOST_UID=$(id -u) - docker-compose -f LNX-docker-compose.yml up --build --exit-code-from app + docker compose -f LNX-docker-compose.yml up --build --exit-code-from app lint: runs-on: ubuntu-latest strategy: @@ -220,7 +220,7 @@ jobs: - name: Publish pip release run: | export HOST_UID=$(id -u) - docker-compose -f docker-compose-build.yaml run \ + docker compose -f docker-compose-build.yaml run \ -e TWINE_USERNAME=${TWINE_USERNAME} -e TWINE_PASSWORD=${TWINE_PASSWORD} app \ sh -c "pip install twine && python -m twine upload dist/*" - name: Login to DockerHub diff --git a/CHANGELOG.md b/CHANGELOG.md index c22d6e80..2fe4814b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ - Changed - Returning success count after the .populate() call - PR [#1050](https://github.com/datajoint/datajoint-python/pull/1050) - Fixed - `Autopopulate.populate` excludes `reserved` jobs in addition to `ignore` and `error` jobs - Fixed - Issue [#1159]((https://github.com/datajoint/datajoint-python/pull/1159) (cascading delete) - PR [#1160](https://github.com/datajoint/datajoint-python/pull/1160) +- Fixed - `docker compose` commands in CI [#1164](https://github.com/datajoint/datajoint-python/pull/1164) ### 0.14.1 -- Jun 02, 2023 - Fixed - Fix altering a part table that uses the "master" keyword - PR [#991](https://github.com/datajoint/datajoint-python/pull/991)