improve conditions

FH-Inway · May 4, 2024 · bbe76f2 · bbe76f2
1 parent d3e6dea
commit bbe76f2
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/.github/workflows/build-manual.yml b/.github/workflows/build-manual.yml
@@ -11,12 +11,9 @@ on:
           - $True
       skipghrelease:
         description: "Determines if creation of a GitHub release is skipped"
-        default: $False
+        default: false
         required: false
-        type: choice
-        options:
-          - $False
-          - $True
+        type: boolean
       skipValidation:
         description: "Determines if the module validation is skipped"
         default: false

diff --git a/.github/workflows/tmpl-build-release.yml b/.github/workflows/tmpl-build-release.yml
@@ -24,9 +24,9 @@ on:
         type: string
       skipghrelease:
         description: "Determines if a GitHub release is created"
-        default: $False
+        default: false
         required: false
-        type: string
+        type: boolean
       skipValidation:
         description: "Determines if the module validation is skipped"
         default: false
@@ -50,7 +50,7 @@ jobs:
     - name: Validate
       run: .\build\vsts-validate.ps1
       shell: powershell
-      if: ${{ ! inputs.skipValidation }}
+      if: ${{ success() && ! inputs.skipValidation }}
     - name: Build
       run: .\build\vsts-build.ps1 -ApiKey ${{ secrets.apikey }} -AutoVersion:${{ inputs.autoversion }} -SkipPublish:${{ inputs.skippublish }}
       shell: powershell
@@ -62,10 +62,11 @@ jobs:
         $githubReleaseVersion = "$($version.Major).$($version.Minor).$($version.Build)"
         "VERSION=$githubReleaseVersion" >> $env:GITHUB_ENV
       shell: powershell
+      if: ${{ success() && ! inputs.skipghrelease }}
 
     - name: Create GitHub release
       uses: softprops/action-gh-release@v2
-      if: ${{ ! inputs.skipghrelease }}
+      if: ${{ success() && ! inputs.skipghrelease }}
       with:
         name: ${{ env.VERSION }}
         tag_name: ${{ env.VERSION }}