diff --git a/.github/workflows/test-and-build.yml b/.github/workflows/test-and-build.yml index 0226065..85d82b9 100644 --- a/.github/workflows/test-and-build.yml +++ b/.github/workflows/test-and-build.yml @@ -25,25 +25,12 @@ jobs: with: python_version: "3.10" - call-docker-ghcr-workflow-cpu: + call-docker-ghcr-workflow: needs: call-version-info-workflow # Docs: https://github.com/ASFHyP3/actions uses: ASFHyP3/actions/.github/workflows/reusable-docker-ghcr.yml@v0.12.0 with: - version_tag: ${{ needs.call-version-info-workflow.outputs.version_tag }}.cpu - release_branch: main - develop_branch: develop - user: tools-bot - file: Dockerfile - secrets: - USER_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - call-docker-ghcr-workflow-gpu: - needs: call-version-info-workflow - # Docs: https://github.com/ASFHyP3/actions - uses: ASFHyP3/actions/.github/workflows/reusable-docker-ghcr.yml@v0.12.0 - with: - version_tag: ${{ needs.call-version-info-workflow.outputs.version_tag }}.gpu + version_tag: ${{ needs.call-version-info-workflow.outputs.version_tag }} release_branch: main develop_branch: develop user: tools-bot diff --git a/CHANGELOG.md b/CHANGELOG.md index 0de5635..85cacd4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,7 +14,7 @@ and uses [Semantic Versioning](https://semver.org/spec/v2.0.0.html). * This option causes `time_series` to download the GSLC inputs from the `GSLC_granules/` subprefix located within the bucket and prefix given by the `--bucket` and `--bucket-prefix` options. ### Changed -* Releases and test deployments now trigger a Docker build for both a GPU-based image and a CPU-based image. The GPU image tag ends with `.gpu` and the CPU image tag ends with `.cpu`. +* Releases and test deployments now trigger a Docker build for the GPU container, rather than the CPU container. ### Fixed * Fixed the parsing for the `--bounds` option for `time_series`.