diff --git a/.github/workflows/module-ci.yml b/.github/workflows/module-ci.yml index d52007c..d7b89cd 100644 --- a/.github/workflows/module-ci.yml +++ b/.github/workflows/module-ci.yml @@ -1,5 +1,5 @@ -# v3.800.9 -# https://virtocommerce.atlassian.net/browse/VCST-1260 +# v3.800.10 +# https://virtocommerce.atlassian.net/browse/VCST-1738 name: Module CI on: @@ -239,9 +239,9 @@ jobs: module-katalon-tests: if: ${{ ((github.ref == 'refs/heads/dev') && (github.event_name == 'push') && (needs.ci.outputs.run-e2e == 'true')) || - (github.event_name == 'workflow_dispatch')}} + (github.event_name == 'workflow_dispatch') || (github.base_ref == 'dev') && (github.event_name == 'pull_request') }} needs: 'ci' - uses: VirtoCommerce/.github/.github/workflows/e2e.yml@v3.800.9 + uses: VirtoCommerce/.github/.github/workflows/e2e.yml@v3.800.10 with: katalonRepo: 'VirtoCommerce/vc-quality-gate-katalon' @@ -260,7 +260,7 @@ jobs: deploy-cloud: if: ${{ (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/main' || github.ref == 'refs/heads/dev') && github.event_name == 'push' }} needs: ci - uses: VirtoCommerce/.github/.github/workflows/deploy-cloud.yml@v3.800.9 + uses: VirtoCommerce/.github/.github/workflows/deploy-cloud.yml@v3.800.10 with: releaseSource: module moduleId: ${{ needs.ci.outputs.moduleId }} diff --git a/.github/workflows/module-release-hotfix.yml b/.github/workflows/module-release-hotfix.yml index 967db97..aaa4675 100644 --- a/.github/workflows/module-release-hotfix.yml +++ b/.github/workflows/module-release-hotfix.yml @@ -1,5 +1,5 @@ -# v3.800.9 -# https://virtocommerce.atlassian.net/browse/VCST-1260 +# v3.800.10 +# https://virtocommerce.atlassian.net/browse/VCST-1738 name: Release hotfix on: @@ -13,12 +13,12 @@ on: jobs: test: - uses: VirtoCommerce/.github/.github/workflows/test-and-sonar.yml@v3.800.9 + uses: VirtoCommerce/.github/.github/workflows/test-and-sonar.yml@v3.800.10 secrets: sonarToken: ${{ secrets.SONAR_TOKEN }} build: - uses: VirtoCommerce/.github/.github/workflows/build.yml@v3.800.9 + uses: VirtoCommerce/.github/.github/workflows/build.yml@v3.800.10 with: uploadPackage: 'true' uploadDocker: 'false' @@ -46,7 +46,7 @@ jobs: publish-github-release: needs: [build, test, get-metadata] - uses: VirtoCommerce/.github/.github/workflows/publish-github.yml@v3.800.9 + uses: VirtoCommerce/.github/.github/workflows/publish-github.yml@v3.800.10 with: fullKey: ${{ needs.build.outputs.packageFullKey }} changeLog: '${{ needs.get-metadata.outputs.changeLog }}' diff --git a/.github/workflows/publish-nugets.yml b/.github/workflows/publish-nugets.yml index 655f9ba..bee4b38 100644 --- a/.github/workflows/publish-nugets.yml +++ b/.github/workflows/publish-nugets.yml @@ -1,5 +1,5 @@ -# v3.800.9 -# https://virtocommerce.atlassian.net/browse/VCST-1260 +# v3.800.10 +# https://virtocommerce.atlassian.net/browse/VCST-1738 name: Publish nuget on: @@ -13,12 +13,12 @@ on: jobs: test: - uses: VirtoCommerce/.github/.github/workflows/test-and-sonar.yml@v3.800.9 + uses: VirtoCommerce/.github/.github/workflows/test-and-sonar.yml@v3.800.10 secrets: sonarToken: ${{ secrets.SONAR_TOKEN }} build: - uses: VirtoCommerce/.github/.github/workflows/build.yml@v3.800.9 + uses: VirtoCommerce/.github/.github/workflows/build.yml@v3.800.10 with: uploadPackage: 'true' uploadDocker: 'false' @@ -29,7 +29,7 @@ jobs: publish-nuget: needs: [build, test] - uses: VirtoCommerce/.github/.github/workflows/publish-github.yml@v3.800.9 + uses: VirtoCommerce/.github/.github/workflows/publish-github.yml@v3.800.10 with: fullKey: ${{ needs.build.outputs.packageFullKey }} forceGithub: false diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index cb4030e..f7a9ab0 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,5 +1,5 @@ -# v3.800.9 -# https://virtocommerce.atlassian.net/browse/VCST-1260 +# v3.800.10 +# https://virtocommerce.atlassian.net/browse/VCST-1738 name: Release on: @@ -7,6 +7,6 @@ on: jobs: release: - uses: VirtoCommerce/.github/.github/workflows/release.yml@v3.800.9 + uses: VirtoCommerce/.github/.github/workflows/release.yml@v3.800.10 secrets: envPAT: ${{ secrets.REPO_TOKEN }} \ No newline at end of file