Skip to content

Commit

Permalink
Merge pull request #1164 from ethho/fix-ci-docker-compose
Browse files Browse the repository at this point in the history
Fix docker compose commands in CI
  • Loading branch information
dimitri-yatsenko authored Aug 9, 2024
2 parents 685b42c + c5d37d2 commit b2a7eab
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/development.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit b2a7eab

Please sign in to comment.