Skip to content

Commit

Permalink
Merge pull request labgrid-project#1300 from Bastian-Krause/bst/docke…
Browse files Browse the repository at this point in the history
…r-update-setuptools

github/workflows/docker: upgrade setuptools before installing setuptools_scm
  • Loading branch information
Emantor authored Nov 28, 2023
2 parents ad3d6f7 + 2c475e6 commit c4a0867
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@ jobs:
- name: Install system dependencies
run: |
sudo apt install -yq python3-pip
python3 -m pip install setuptools_scm
pip install --upgrade setuptools
pip install setuptools_scm
- name: Login to DockerHub
uses: docker/login-action@v3
with:
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/reusable-unit-tests-docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ jobs:
- name: Install system dependencies
run: |
sudo apt install -yq python3-pip
python3 -m pip install setuptools_scm
pip install --upgrade setuptools
pip install setuptools_scm
- name: Build docker images
run: |
./dockerfiles/build.sh
Expand Down

0 comments on commit c4a0867

Please sign in to comment.