Skip to content

Commit

Permalink
Merge branch 'main' into develop
Browse files Browse the repository at this point in the history
# Conflicts:
#	CHANGELOG.md
#	poetry.lock
#	pyproject.toml
  • Loading branch information
James Wood authored and James Wood committed Jun 10, 2024
2 parents e9a7860 + 705ac78 commit bc7d9de
Show file tree
Hide file tree
Showing 4 changed files with 175 additions and 144 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build-pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ jobs:
poetry publish
- name: Log in to the Container registry
if: ${{ !startsWith(github.ref, 'refs/heads/feature') }}
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
registry: ${{ env.REGISTRY }}
username: ${{ github.actor }}
Expand All @@ -233,7 +233,7 @@ jobs:
- name: Build and push Docker image
if: ${{ !startsWith(github.ref, 'refs/heads/feature') }}
id: docker-push
uses: docker/build-push-action@v3
uses: docker/build-push-action@v5
with:
context: .
file: docker/Dockerfile
Expand Down
23 changes: 23 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,29 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

### Added
### Changed
### Changed
### Deprecated
### Removed
### Fixed


## [0.9.0]

### Added
### Changed
- Updated python libraries
- [issue #114](https://github.com/podaac/concise/issues/114): add type annotations
### Deprecated
### Removed
- Removed CMR testing. Now done in [concise-autotest](https://github.com/podaac/concise-autotest) repo
- Moved add_collection_test.py test to verify_collection.py (in concise-autotest repo)
### Fixed


## [0.9.0]

### Added
### Changed
- Updated python libraries
Expand Down
Loading

0 comments on commit bc7d9de

Please sign in to comment.