diff --git a/.github/workflows/deploy_release.yaml b/.github/workflows/deploy_release.yaml index 560cbd6..5b47141 100644 --- 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 index ce43b9a..5a67f5d 100644 --- a/.github/workflows/test_integration.yaml +++ b/.github/workflows/test_integration.yaml @@ -27,7 +27,9 @@ 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 }} @@ -35,7 +37,9 @@ jobs: 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" @@ -43,7 +47,9 @@ jobs: 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 index 0972847..169ad8d 100644 --- 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 }} +