Merge pull request #6 from TheJacksonLaboratory/G3-5-test-cluster-dep…

…loyment Fixing actions yaml and bumping prerelease version
TheJacksonLaboratory · Dec 13, 2023 · 4dbfbd3 · 4dbfbd3
2 parents c399104 + 06fad48
commit 4dbfbd3
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 11 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -40,6 +40,10 @@ jobs:
   version:
     needs: test
     runs-on: ubuntu-latest
+    outputs:
+      should_release: ${{ steps.version_check.outputs.should_release }}
+      prerelease: ${{ steps.version_check.outputs.prerelease }}
+      version: ${{ steps.version_check.outputs.version }}
     steps:
     - name: Check out code
       uses: actions/checkout@v3
@@ -79,30 +83,30 @@ jobs:
         fi
   build:
     name: "Build"
-    needs: [ test, check-coverage, format-lint ]
-    if: ${{ steps.version_check.outputs.should_release }} == 'true'
+    needs: [ test, check-coverage, format-lint, version ]
+    if: ${{ needs.version.outputs.should_release }} == 'true'
     uses: ./.github/workflows/_skaffold-build-k8s.yml
     secrets: inherit
   deploy_sqa:
     name: "Deploy: SQA"
     needs: [build, version]
-    if: ${{ steps.version_check.outputs.should_release }} == 'true'
+    if: ${{ needs.version.outputs.should_release }} == 'true'
     uses: ./.github/workflows/_skaffold-deploy-k8s.yml
     secrets: inherit
     with:
       environment: "jax-cluster-dev-10--sqa"
   deploy_stage:
     name: "Deploy: Stage"
     needs: [ build, version, deploy_sqa]
-    if: ${{ steps.version_check.outputs.should_release == 'true' && steps.version_check.outputs.prerelease == 'false'}}
+    if: ${{ needs.version.outputs.should_release == 'true' && needs.version.outputs.prerelease == 'false'}}
     uses: ./.github/workflows/_skaffold-deploy-k8s.yml
     secrets: inherit
     with:
       environment: "jax-cluster-prod-10--stage"
   deploy_prod:
     name: "Deploy: Prod"
-    needs: [ build, version, deploy_sqa]
-    if: ${{ steps.version_check.outputs.should_release == 'true' && steps.version_check.outputs.prerelease == 'false'}}
+    needs: [ build, version, deploy_stage]
+    if: ${{ needs.version.outputs.should_release == 'true' && needs.version.outputs.prerelease == 'false'}}
     uses: ./.github/workflows/_skaffold-deploy-k8s.yml
     secrets: inherit
     with:
@@ -111,19 +115,19 @@ jobs:
     name: "Create Github Release Draft"
     runs-on: ubuntu-latest
     needs: [ deploy_prod ]
-    if: ${{ steps.version_check.outputs.should_release == 'true' && steps.version_check.outputs.prerelease == 'false'}}
+    if: ${{ needs.version.outputs.should_release == 'true' && needs.version.outputs.prerelease == 'false'}}
     steps:
       - name: Create GitHub Release
         uses: softprops/action-gh-release@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           tag_name: v${{ steps.version_check.outputs.version }}
-          name: Release v${{ steps.version_check.outputs.version }}
+          name: Release v${{ needs.version.outputs.version }}
           draft: true
-          prerelease: ${{ steps.release_type.outputs.prerelease }}
+          prerelease: ${{ needs.version.outputs.prerelease }}
           body: |
-            Release v${{ steps.version_check.outputs.version }}
+            Release v${{ needs.version.outputs.version }}
           files: |
             dist/*
             LICENSE

diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "geneweaver-api"
-version = "0.0.1a2"
+version = "0.0.1a3"
 description = "description"
 authors = ["Jax Computational Sciences <cssc@jax.org>"]
 packages = [