Skip to content

Commit

Permalink
Merge branch 'main' into pre-commit-ci-update-config
Browse files Browse the repository at this point in the history
  • Loading branch information
Anselmoo authored Dec 17, 2024
2 parents 32e53c1 + ee4ced3 commit c69bc85
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 152 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/conda_check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
steps:
- uses: actions/checkout@v4
- name: Set up Python 3.10
uses: actions/setup-python@v3
uses: actions/setup-python@v5
with:
python-version: '3.10'
- name: Add conda to system path
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docker-cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jobs:
uses: docker/[email protected]

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3.7.1
uses: docker/setup-buildx-action@v3.8.0

- name: Login to GitHub Container Registry
uses: docker/[email protected]
Expand Down
154 changes: 4 additions & 150 deletions poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit c69bc85

Please sign in to comment.