Merge pull request #50 from ASFHyP3/develop

Release v0.7.0
ASFHyP3 · Jan 13, 2023 · f290f6f · f290f6f
2 parents b0a5c5c + 21853ff
commit f290f6f
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 36 deletions.
diff --git a/.github/workflows/reusable-docker-ecr.yml b/.github/workflows/reusable-docker-ecr.yml
@@ -67,14 +67,14 @@ jobs:
 
       - name: Add test tag
         if: github.ref == format('refs/heads/{0}', inputs.develop_branch)
-        uses: akhilerm/tag-push-action@v2.0.0
+        uses: akhilerm/tag-push-action@v2.1.0
         with:
           src: ${{ inputs.ecr_registry }}/${{ env.REPO }}:${{ inputs.version_tag }}
           dst: ${{ inputs.ecr_registry }}/${{ env.REPO }}:test
 
       - name: Add latest tag
         if: github.ref == format('refs/heads/{0}', inputs.release_branch)
-        uses: akhilerm/tag-push-action@v2.0.0
+        uses: akhilerm/tag-push-action@v2.1.0
         with:
           src: ${{ inputs.ecr_registry }}/${{ env.REPO }}:${{ inputs.version_tag }}
           dst: ${{ inputs.ecr_registry }}/${{ env.REPO }}:latest

diff --git a/.github/workflows/reusable-docker-ghcr.yml b/.github/workflows/reusable-docker-ghcr.yml
@@ -60,14 +60,14 @@ jobs:
 
       - name: Add test tag
         if: github.ref == format('refs/heads/{0}', inputs.develop_branch)
-        uses: akhilerm/tag-push-action@v2.0.0
+        uses: akhilerm/tag-push-action@v2.1.0
         with:
           src: ghcr.io/${{ env.REPO }}:${{ inputs.version_tag }}
           dst: ghcr.io/${{ env.REPO }}:test
 
       - name: Add latest tag
         if: github.ref == format('refs/heads/{0}', inputs.release_branch)
-        uses: akhilerm/tag-push-action@v2.0.0
+        uses: akhilerm/tag-push-action@v2.1.0
         with:
           src: ghcr.io/${{ env.REPO }}:${{ inputs.version_tag }}
           dst: ghcr.io/${{ env.REPO }}:latest
diff --git a/.github/workflows/reusable-pytest.yml b/.github/workflows/reusable-pytest.yml
@@ -1,9 +1,6 @@
 on:
   workflow_call:
     inputs:
-      conda_env_name:
-        required: true
-        type: string
       local_package_name:
         required: true
         type: string
@@ -25,12 +22,10 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
-      - uses: conda-incubator/setup-miniconda@v2
+      - uses: mamba-org/provision-with-micromamba@v14
         with:
-          mamba-version: "*"
-          python-version: ${{ matrix.python_version }}
-          activate-environment: ${{ inputs.conda_env_name }}
-          environment-file: environment.yml
+          extra-specs: |
+            python=${{ matrix.python_version }}
 
       - name: Pytest in conda environment
         shell: bash -l {0}

diff --git a/.github/workflows/reusable-version-info.yml b/.github/workflows/reusable-version-info.yml
@@ -1,9 +1,6 @@
 on:
   workflow_call:
     inputs:
-      conda_env_name:
-        required: true
-        type: string
       python_version:
         required: false
         default: '3.9'
@@ -26,12 +23,10 @@ jobs:
         with:
           fetch-depth: 0
 
-      - uses: conda-incubator/setup-miniconda@v2
+      - uses: mamba-org/provision-with-micromamba@v14
         with:
-          mamba-version: "*"
-          python-version: ${{ inputs.python_version }}
-          activate-environment: ${{ inputs.conda_env_name }}
-          environment-file: environment.yml
+          extra-specs: |
+            python=${{ inputs.python_version }}
 
       - name: set outputs
         id: set_outputs

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,13 @@ and this project adheres to [PEP 440](https://www.python.org/dev/peps/pep-0440/)
 and uses [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 
+## [0.7.0]
+
+### Changed
+* `conda` environments are now provisioned with micromamba in all reusable workflows
+* [`reusable-pytest.yml`](.github/workflows/reusable-pytest.yml) and [`reusable-pytest.yml`](.github/workflows/reusable-version-info.yml)
+  no longer accept a `conda_env_name` input and will use the environment named in the calling repo's `environment.yml`
+
 ## [0.6.0]
 
 ### Changed

diff --git a/README.md b/README.md
@@ -25,7 +25,7 @@ on:
 
 jobs:
   call-bump-version-workflow:
-    uses: ASFHyP3/actions/.github/workflows/reusable-bump-version.yml@v0.6.0
+    uses: ASFHyP3/actions/.github/workflows/reusable-bump-version.yml@v0.7.0
     with:
       user: tools-bot                # Optional; default shown
       email: [email protected]  # Optional; default shown
@@ -57,7 +57,7 @@ on:
 
 jobs:
   call-changelog-check-workflow:
-    uses: ASFHyP3/actions/.github/workflows/reusable-changelog-check.yml@v0.6.0
+    uses: ASFHyP3/actions/.github/workflows/reusable-changelog-check.yml@v0.7.0
     secrets:
       USER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 ```
@@ -87,13 +87,13 @@ on:
 
 jobs:
   call-version-info-workflow:
-    uses: ASFHyP3/actions/.github/workflows/reusable-version-info.yml@v0.6.0
+    uses: ASFHyP3/actions/.github/workflows/reusable-version-info.yml@v0.7.0
     with:
       conda_env_name: hyp3-plugin
 
   call-docker-ecr-workflow:
     needs: call-version-info-workflow
-    uses: ASFHyP3/actions/.github/workflows/reusable-docker-ecr.yml@v0.6.0
+    uses: ASFHyP3/actions/.github/workflows/reusable-docker-ecr.yml@v0.7.0
     with:
       version_tag: ${{ needs.call-version-info-workflow.outputs.version_tag }}
       ecr_registry: 845172464411.dkr.ecr.us-west-2.amazonaws.com
@@ -128,13 +128,13 @@ on:
 
 jobs:
   call-version-info-workflow:
-    uses: ASFHyP3/actions/.github/workflows/reusable-version-info.yml@v0.6.0
+    uses: ASFHyP3/actions/.github/workflows/reusable-version-info.yml@v0.7.0
     with:
       conda_env_name: hyp3-plugin
 
   call-docker-ghcr-workflow:
     needs: call-version-info-workflow
-    uses: ASFHyP3/actions/.github/workflows/reusable-docker-ghcr.yml@v0.6.0
+    uses: ASFHyP3/actions/.github/workflows/reusable-docker-ghcr.yml@v0.7.0
     with:
       version_tag: ${{ needs.call-version-info-workflow.outputs.version_tag }}
       release_branch: main     # Optional; default shown
@@ -155,7 +155,7 @@ on: push
 
 jobs:
   call-flake8-workflow:
-    uses: ASFHyP3/actions/.github/workflows/reusable-flake8.yml@v0.6.0
+    uses: ASFHyP3/actions/.github/workflows/reusable-flake8.yml@v0.7.0
     with:
       local_package_names: hyp3_plugin  # Required; comma-seperated list of names that should be considered local to your application
       excludes: hyp3_plugin/ugly.py     # Optional; comma-separated list of glob patterns to exclude from checks
@@ -183,7 +183,7 @@ on:
 
 jobs:
   call-git-object-name-workflow:
-    uses: ASFHyP3/actions/.github/workflows/reusable-git-object-name.yml@v0.6.0
+    uses: ASFHyP3/actions/.github/workflows/reusable-git-object-name.yml@v0.7.0
   
   echo-git-object-name-outputs:
     needs: call-git-object-name-workflow
@@ -213,7 +213,7 @@ on:
 
 jobs:
   call-labeled-pr-check-workflow:
-    uses: ASFHyP3/actions/.github/workflows/reusable-labeled-pr-check.yml@v0.6.0
+    uses: ASFHyP3/actions/.github/workflows/reusable-labeled-pr-check.yml@v0.7.0
 ```
 to ensure a release label is included on any PR to `main`.
 
@@ -237,10 +237,9 @@ on:
 
 jobs:
   call-pytest-workflow:
-    uses: ASFHyP3/actions/.github/workflows/reusable-pytest.yml@v0.6.0
+    uses: ASFHyP3/actions/.github/workflows/reusable-pytest.yml@v0.7.0
     with:
       local_package_name: hyp3_plugin  # Required; package to produce a coverage report for
-      conda_env_name: hyp3-plugin      # Required; conda environment name to activate
       # Optional; default shown
       python_versions: >-
         ["3.8", "3.9", "3.10"]
@@ -267,7 +266,7 @@ on:
 
 jobs:
   call-release-workflow:
-    uses: ASFHyP3/actions/.github/workflows/reusable-release.yml@v0.6.0
+    uses: ASFHyP3/actions/.github/workflows/reusable-release.yml@v0.7.0
     with:
       release_prefix: HyP3-CI
       release_branch: main      # Optional; default shown
@@ -294,7 +293,7 @@ on:
   
 jobs:
   call-release-workflow:
-    uses: ASFHyP3/actions/.github/workflows/reusable-relese-checklist-comment.yml@v0.6.0
+    uses: ASFHyP3/actions/.github/workflows/reusable-relese-checklist-comment.yml@v0.7.0
     with:
       # optional; example shown
       additional_developer_items: '- [ ] If the step function code has changed, have you drained the job queue before merging?'
@@ -321,7 +320,7 @@ on: push
 
 jobs:
   call-secrets-analysis-workflow:
-    uses: ASFHyP3/actions/.github/workflows/reusable-secrets-analysis.yml@v0.6.0
+    uses: ASFHyP3/actions/.github/workflows/reusable-secrets-analysis.yml@v0.7.0
 ```
 to scan every push for secrets.
 
@@ -347,9 +346,8 @@ on:
 
 jobs:
   call-version-info-workflow:
-    uses: ASFHyP3/actions/.github/workflows/reusable-version-info.yml@v0.6.0
+    uses: ASFHyP3/actions/.github/workflows/reusable-version-info.yml@v0.7.0
     with:
-      conda_env_name: hyp3-plugin  # Required; conda environment name to activate
       python_version: '3.9'        # Optional; default shown
 
   echo-version-info-outputs: