fix: simplify versions

giard-alexandre · Aug 8, 2024 · ba339cf · ba339cf
1 parent 4175659
commit ba339cf
Showing 1 changed file with 14 additions and 15 deletions.
diff --git a/.github/workflows/release-please.yml b/.github/workflows/release-please.yml
@@ -10,17 +10,19 @@ defaults:
     working-directory: src
 
 jobs:
+  # Creates Release PRs then, once merged, the same job will:
+  # - Tag the full version (hence the following version tag job for short tag names)
+  # - Create the release for this version
+  # -
   release-please:
     name: ✨ Release Please
     runs-on: ubuntu-latest
     permissions:
       contents: write # releases, tags
       pull-requests: write
     outputs:
-      created: ${{ steps.release.outputs.release_created }}
-      version_major: ${{ steps.release.outputs.version_major }}
-      version_minor: ${{ steps.release.outputs.version_minor }}
-      version_patch: ${{ steps.release.outputs.version_patch }}
+      release_created: ${{ steps.release.outputs.release_created }}
+      pr_created: ${{ steps.release.outputs.release_created }}
       v_major: ${{ steps.release.outputs.major }}
       v_minor: ${{ steps.release.outputs.minor }}
       v_patch: ${{ steps.release.outputs.patch }}
@@ -39,21 +41,18 @@ jobs:
       contents: write # releases, tags
     needs:
       - release-please
-    #if: ${{ needs.release-please.outputs.version_major && needs.release-please.outputs.version_minor && needs.release-please.outputs.version_patch }}
+    if: ${{ needs.release-please.outputs.version }}
     env:
-      V_MAJOR: ${{ needs.release-please.outputs.version_major }}
-      V_MINOR: ${{ needs.release-please.outputs.version_minor }}
-      V_PATCH: ${{ needs.release-please.outputs.version_patch }}
+      V_MAJOR: ${{ needs.release-please.outputs.major }}
+      V_MINOR: ${{ needs.release-please.outputs.minor }}
+      V_PATCH: ${{ needs.release-please.outputs.patch }}
     steps:
       - name: 🛒 Checkout
         uses: actions/checkout@v4
       - run: |
-          echo "Major version: ${{ needs.release-please.outputs.version_major }}"
-          echo "Minor version: ${{ needs.release-please.outputs.version_minor }}"
-          echo "Patch version: ${{ needs.release-please.outputs.version_patch }}"
-          echo "Non-Version Major version: ${{ needs.release-please.outputs.v_major }}"
-          echo "Non-Version Minor version: ${{ needs.release-please.outputs.v_minor }}"
-          echo "Non-Version Patch version: ${{ needs.release-please.outputs.v_patch }}"
+          echo "Major version: ${{ needs.release-please.outputs.v_major }}"
+          echo "Minor version: ${{ needs.release-please.outputs.v_minor }}"
+          echo "Patch version: ${{ needs.release-please.outputs.v_patch }}"
           echo "env Major version: ${{ env.V_MAJOR }}"
           echo "env Minor version: ${{ env.V_MINOR }}"
           echo "env Patch version: ${{ env.V_PATCH }}"
@@ -66,7 +65,7 @@ jobs:
     needs:
       - release-please
       - tag-commits
-    if: ${{ needs.release-please.outputs.created }}
+    if: ${{ needs.release-please.outputs.release_created }}
     steps:
       - name: 🛒 Checkout
         uses: actions/checkout@v4