fix: Attempted semantic release fix

Fgruntjes · Feb 1, 2023 · a294d63 · a294d63
1 parent 098ad8c
commit a294d63
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 6 deletions.
diff --git a/.github/workflows/deploy_release.yaml b/.github/workflows/deploy_release.yaml
@@ -12,9 +12,9 @@ jobs:
             id: semver
             with:
                 input_string: ${{ github.ref }}
-                version_extractor_regex: "\/v(.*)$"
+                version_extractor_regex: '\/v(.*)$'
         -   id: environment
-            run: PRERELASE=${{ steps.semver.outputs.prerelease }} echo "var=$([ -z "${PRERELASE}" ] && echo "production" || echo "${PRERELASE}")" >> $GITHUB_OUTPUT
+            run: echo "var=${{ steps.semver.outputs.prerelease || "production" }}" >> $GITHUB_OUTPUT
         outputs:
             environment: ${{ steps.environment.outputs.var }}
             tag: v${{ steps.semver.outputs.fullversion }}

diff --git a/.github/workflows/test_integration.yaml b/.github/workflows/test_integration.yaml
@@ -27,23 +27,29 @@ jobs:
         needs: [deploy_slug, build]
         uses: ./.github/workflows/deploy.yaml
         secrets: inherit
-        concurrency: ${{ needs.deploy_slug.outputs.environment }}
+        concurrency: 
+            group: ${{ needs.deploy_slug.outputs.environment }}
+            cancel-in-progress: true
         with:
             environment: ${{ needs.deploy_slug.outputs.environment }}
             tag: ${{ needs.deploy_slug.outputs.tag }}
 
     test:
         runs-on: ubuntu-latest
         needs: [deploy_slug, deploy]
-        concurrency: ${{ needs.deploy_slug.outputs.environment }}
+        concurrency:
+            group: ${{ needs.deploy_slug.outputs.environment }}
+            cancel-in-progress: true
         steps:
         -   run: echo "Do some integration tests on this tmp environment"
 
     delete:
         needs: [deploy_slug, test]
         uses: ./.github/workflows/delete.yaml
         secrets: inherit
-        concurrency: ${{ needs.deploy_slug.outputs.environment }}
+        concurrency:
+            group: ${{ needs.deploy_slug.outputs.environment }}
+            cancel-in-progress: true
         if: ${{ always() }}
         with:
             environment: ${{ needs.deploy_slug.outputs.environment }}
diff --git a/.github/workflows/test_unit.yaml b/.github/workflows/test_unit.yaml
@@ -54,4 +54,5 @@ jobs:
         -   run: dotnet restore ${{ matrix.project }}
         -   run: dotnet build --no-restore ${{ matrix.project }}
         -   run: docker-compose -f App.Lib.Tests/docker-compose.yaml up -d
-        -   run: dotnet test --no-restore --no-build
+        -   run: dotnet test --no-restore --no-build ${{ matrix.project }}
+