From 44e62dffad18270112f711b6e9fed20c0eb8cdfc Mon Sep 17 00:00:00 2001 From: Andrew Kubyshkin Date: Thu, 28 May 2026 16:32:32 +0500 Subject: [PATCH 1/2] VCST-5151: Add swagger validation to module-ci --- .github/workflows/build.yml | 4 +- .github/workflows/deploy-cloud.yml | 4 +- .github/workflows/deploy-module-workflows.yml | 2 +- .github/workflows/deploy.yml | 4 +- .../docker-image-vulnerability-process.yml | 4 +- .github/workflows/e2e-autotests.yml | 4 +- .github/workflows/e2e.yml | 6 +-- .github/workflows/get-metadata.yml | 4 +- .github/workflows/increment-version.yml | 4 +- .github/workflows/publish-docker.yml | 4 +- .github/workflows/publish-github.yml | 4 +- .github/workflows/pytest-tests.yml | 4 +- .github/workflows/release.yml | 4 +- .github/workflows/test-and-sonar.yml | 4 +- .github/workflows/ui-autotests.yml | 4 +- workflow-templates/module-ci.yml | 40 +++++++++++++------ workflow-templates/module-deploy.yml | 4 +- workflow-templates/module-release-hotfix.yml | 10 ++--- workflow-templates/publish-nugets.yml | 10 ++--- workflow-templates/release.yml | 6 +-- 20 files changed, 72 insertions(+), 58 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c5fb89b..4e9a793 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,5 +1,5 @@ -# v3.800.35 -# https://virtocommerce.atlassian.net/browse/VCST-5063 +# v3.800.36 +# https://virtocommerce.atlassian.net/browse/VCST-5151 name: VC build on: diff --git a/.github/workflows/deploy-cloud.yml b/.github/workflows/deploy-cloud.yml index 41ca3d1..c76d23f 100644 --- a/.github/workflows/deploy-cloud.yml +++ b/.github/workflows/deploy-cloud.yml @@ -1,5 +1,5 @@ -# v3.800.35 -# https://virtocommerce.atlassian.net/browse/VCST-5063 +# v3.800.36 +# https://virtocommerce.atlassian.net/browse/VCST-5151 name: VC cloud deployment on: diff --git a/.github/workflows/deploy-module-workflows.yml b/.github/workflows/deploy-module-workflows.yml index ec310f5..d09b80b 100644 --- a/.github/workflows/deploy-module-workflows.yml +++ b/.github/workflows/deploy-module-workflows.yml @@ -7,7 +7,7 @@ on: description: 'Version to deploy' required: true type: string - default: 'v3.800.35' + default: 'v3.800.36' jobs: diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 35ef1fe..e5edc9a 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -1,5 +1,5 @@ -# v3.800.35 -# https://virtocommerce.atlassian.net/browse/VCST-5063 +# v3.800.36 +# https://virtocommerce.atlassian.net/browse/VCST-5151 name: VC deployment on: diff --git a/.github/workflows/docker-image-vulnerability-process.yml b/.github/workflows/docker-image-vulnerability-process.yml index 0d53e74..3605dfa 100644 --- a/.github/workflows/docker-image-vulnerability-process.yml +++ b/.github/workflows/docker-image-vulnerability-process.yml @@ -1,5 +1,5 @@ -# v3.800.35 -# https://virtocommerce.atlassian.net/browse/VCST-5063 +# v3.800.36 +# https://virtocommerce.atlassian.net/browse/VCST-5151 name: Docker image vulnerability process on: diff --git a/.github/workflows/e2e-autotests.yml b/.github/workflows/e2e-autotests.yml index 855fe62..b662984 100644 --- a/.github/workflows/e2e-autotests.yml +++ b/.github/workflows/e2e-autotests.yml @@ -1,5 +1,5 @@ -# v3.800.35 -# https://virtocommerce.atlassian.net/browse/VCST-5063 +# v3.800.36 +# https://virtocommerce.atlassian.net/browse/VCST-5151 name: Common E2E tests on: diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index e61c181..f4d035c 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -1,5 +1,5 @@ -# v3.800.35 -# https://virtocommerce.atlassian.net/browse/VCST-5063 +# v3.800.36 +# https://virtocommerce.atlassian.net/browse/VCST-5151 name: Common katalon tests on: @@ -88,7 +88,7 @@ jobs: - name: Docker Env uses: VirtoCommerce/vc-github-actions/docker-env@master with: - githubUser: ${{ env.GITHUB_ACTOR }} + githubUser: ${{ github.actor }} githubToken: ${{ env.GITHUB_TOKEN }} platformDockerTag: ${{ inputs.platformDockerTag }} platformImage: ghcr.io/virtocommerce/platform diff --git a/.github/workflows/get-metadata.yml b/.github/workflows/get-metadata.yml index 799ae00..16c9d74 100644 --- a/.github/workflows/get-metadata.yml +++ b/.github/workflows/get-metadata.yml @@ -1,5 +1,5 @@ -# v3.800.35 -# https://virtocommerce.atlassian.net/browse/VCST-5063 +# v3.800.36 +# https://virtocommerce.atlassian.net/browse/VCST-5151 name: Get metadata on: diff --git a/.github/workflows/increment-version.yml b/.github/workflows/increment-version.yml index 9a1f26a..047d04d 100644 --- a/.github/workflows/increment-version.yml +++ b/.github/workflows/increment-version.yml @@ -1,5 +1,5 @@ -# v3.800.35 -# https://virtocommerce.atlassian.net/browse/VCST-5063 +# v3.800.36 +# https://virtocommerce.atlassian.net/browse/VCST-5151 name: Increment version on: diff --git a/.github/workflows/publish-docker.yml b/.github/workflows/publish-docker.yml index 8adcb9d..3d3d4ec 100644 --- a/.github/workflows/publish-docker.yml +++ b/.github/workflows/publish-docker.yml @@ -1,5 +1,5 @@ -# v3.800.35 -# https://virtocommerce.atlassian.net/browse/VCST-5063 +# v3.800.36 +# https://virtocommerce.atlassian.net/browse/VCST-5151 name: VC Publish docker on: diff --git a/.github/workflows/publish-github.yml b/.github/workflows/publish-github.yml index afe08fe..874b87e 100644 --- a/.github/workflows/publish-github.yml +++ b/.github/workflows/publish-github.yml @@ -1,5 +1,5 @@ -# v3.800.35 -# https://virtocommerce.atlassian.net/browse/VCST-5063 +# v3.800.36 +# https://virtocommerce.atlassian.net/browse/VCST-5151 name: VC Publish Github release and Nuget package on: diff --git a/.github/workflows/pytest-tests.yml b/.github/workflows/pytest-tests.yml index dbe52d4..181320f 100644 --- a/.github/workflows/pytest-tests.yml +++ b/.github/workflows/pytest-tests.yml @@ -1,5 +1,5 @@ -# v3.800.35 -# https://virtocommerce.atlassian.net/browse/VCST-5063 +# v3.800.36 +# https://virtocommerce.atlassian.net/browse/VCST-5151 name: Auto tests on: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c42685b..5ac178e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,5 +1,5 @@ -# v3.800.35 -# https://virtocommerce.atlassian.net/browse/VCST-5063 +# v3.800.36 +# https://virtocommerce.atlassian.net/browse/VCST-5151 name: Release workflow on: diff --git a/.github/workflows/test-and-sonar.yml b/.github/workflows/test-and-sonar.yml index d61b5d7..2bb3472 100644 --- a/.github/workflows/test-and-sonar.yml +++ b/.github/workflows/test-and-sonar.yml @@ -1,5 +1,5 @@ -# v3.800.35 -# https://virtocommerce.atlassian.net/browse/VCST-5063 +# v3.800.36 +# https://virtocommerce.atlassian.net/browse/VCST-5151 name: VC unit test and sonar scan on: diff --git a/.github/workflows/ui-autotests.yml b/.github/workflows/ui-autotests.yml index 12e29c4..c6fe1a7 100644 --- a/.github/workflows/ui-autotests.yml +++ b/.github/workflows/ui-autotests.yml @@ -1,5 +1,5 @@ -# v3.800.35 -# https://virtocommerce.atlassian.net/browse/VCST-5063 +# v3.800.36 +# https://virtocommerce.atlassian.net/browse/VCST-5151 name: Common UI tests on: diff --git a/workflow-templates/module-ci.yml b/workflow-templates/module-ci.yml index 592e178..7200cc3 100644 --- a/workflow-templates/module-ci.yml +++ b/workflow-templates/module-ci.yml @@ -1,5 +1,5 @@ -# v3.800.35 -# https://virtocommerce.atlassian.net/browse/VCST-5063 +# v3.800.36 +# https://virtocommerce.atlassian.net/browse/VCST-5151 name: Module CI on: @@ -217,16 +217,16 @@ jobs: PR_BODY: ${{ github.event.pull_request.body }} run: | $text = $env:PR_BODY - $marker = 'Required modules list URL' - $url = '' - if ($null -ne $text -and $text.Contains($marker)) { - $startIndex = $text.IndexOf($marker) - if ($startIndex -ge 0) { - $slice = $text.Substring($startIndex) - $match = [regex]::Match($slice, 'https?://[^ )\r\n]+') - if ($match.Success) { - $url = $match.Value + if ($null -ne $text) { + $pattern = 'Required modules list URL\s*:?\s*(https?://[^\s)>\]]+)' + $m = [regex]::Match($text, $pattern, 'IgnoreCase') + if ($m.Success) { + $candidate = $m.Groups[1].Value.TrimEnd('.', ',', ';') + if ($candidate -match '\.json($|\?)') { + $url = $candidate + } else { + Write-Host "Candidate URL '$candidate' is not a .json file; ignoring." } } } @@ -239,6 +239,20 @@ jobs: Add-Content -Path $env:GITHUB_OUTPUT -Value "url=" } + - name: Swagger validation + uses: VirtoCommerce/vc-github-actions/docker-env@VCST-5054 #master + if: ${{ github.ref == 'refs/heads/dev' || (github.event_name == 'pull_request' && github.base_ref == 'dev') }} + with: + githubUser: ${{ github.actor }} + githubToken: ${{ env.GITHUB_TOKEN }} + installSampleData: 'false' + installModules: 'false' + installCustomModule: 'true' + customModuleId: ${{ steps.artifact_ver.outputs.moduleId }} + customModuleUrl: ${{ steps.artifactUrl.outputs.download_url }} + requiredModulesListUrl: ${{ steps.extract_required_modules_list_url_from_pr.outputs.url }} + platformImage: ghcr.io/virtocommerce/platform + - name: Setup Git Credentials if: ${{ (github.ref == 'refs/heads/dev' && github.event_name != 'workflow_dispatch') || github.ref == 'refs/heads/master' || github.ref == 'refs/heads/main' }} uses: VirtoCommerce/vc-github-actions/setup-git-credentials-github@master @@ -289,7 +303,7 @@ jobs: if: ${{ ((github.ref == 'refs/heads/dev') && (github.event_name == 'push')) || (github.event_name == 'workflow_dispatch') || ((github.base_ref == 'dev') && (github.event_name == 'pull_request')) }} needs: ci - uses: VirtoCommerce/.github/.github/workflows/pytest-tests.yml@v3.800.35 + uses: VirtoCommerce/.github/.github/workflows/pytest-tests.yml@v3.800.36 with: installModules: 'false' installCustomModule: 'true' @@ -310,7 +324,7 @@ jobs: && github.event_name == 'push' && needs.ci.outputs.deployment-folder-exists == 'true'}} needs: ci - uses: VirtoCommerce/.github/.github/workflows/deploy-cloud.yml@v3.800.35 + uses: VirtoCommerce/.github/.github/workflows/deploy-cloud.yml@v3.800.36 with: releaseSource: module moduleId: ${{ needs.ci.outputs.moduleId }} diff --git a/workflow-templates/module-deploy.yml b/workflow-templates/module-deploy.yml index 8ca9ef6..77ba93e 100644 --- a/workflow-templates/module-deploy.yml +++ b/workflow-templates/module-deploy.yml @@ -1,5 +1,5 @@ -# v3.800.35 -# https://virtocommerce.atlassian.net/browse/VCST-5063 +# v3.800.36 +# https://virtocommerce.atlassian.net/browse/VCST-5151 name: Module deployment on: workflow_dispatch: diff --git a/workflow-templates/module-release-hotfix.yml b/workflow-templates/module-release-hotfix.yml index 78c5bb3..6e941b2 100644 --- a/workflow-templates/module-release-hotfix.yml +++ b/workflow-templates/module-release-hotfix.yml @@ -1,5 +1,5 @@ -# v3.800.35 -# https://virtocommerce.atlassian.net/browse/VCST-5063 +# v3.800.36 +# https://virtocommerce.atlassian.net/browse/VCST-5151 name: Release hotfix on: @@ -13,12 +13,12 @@ on: jobs: test: - uses: VirtoCommerce/.github/.github/workflows/test-and-sonar.yml@v3.800.35 + uses: VirtoCommerce/.github/.github/workflows/test-and-sonar.yml@v3.800.36 secrets: sonarToken: ${{ secrets.SONAR_TOKEN }} build: - uses: VirtoCommerce/.github/.github/workflows/build.yml@v3.800.35 + uses: VirtoCommerce/.github/.github/workflows/build.yml@v3.800.36 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.35 + uses: VirtoCommerce/.github/.github/workflows/publish-github.yml@v3.800.36 with: fullKey: ${{ needs.build.outputs.packageFullKey }} changeLog: '${{ needs.get-metadata.outputs.changeLog }}' diff --git a/workflow-templates/publish-nugets.yml b/workflow-templates/publish-nugets.yml index 37ad131..fce4a63 100644 --- a/workflow-templates/publish-nugets.yml +++ b/workflow-templates/publish-nugets.yml @@ -1,5 +1,5 @@ -# v3.800.35 -# https://virtocommerce.atlassian.net/browse/VCST-5063 +# v3.800.36 +# https://virtocommerce.atlassian.net/browse/VCST-5151 name: Publish nuget on: @@ -13,12 +13,12 @@ on: jobs: test: - uses: VirtoCommerce/.github/.github/workflows/test-and-sonar.yml@v3.800.35 + uses: VirtoCommerce/.github/.github/workflows/test-and-sonar.yml@v3.800.36 secrets: sonarToken: ${{ secrets.SONAR_TOKEN }} build: - uses: VirtoCommerce/.github/.github/workflows/build.yml@v3.800.35 + uses: VirtoCommerce/.github/.github/workflows/build.yml@v3.800.36 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.35 + uses: VirtoCommerce/.github/.github/workflows/publish-github.yml@v3.800.36 with: fullKey: ${{ needs.build.outputs.packageFullKey }} forceGithub: false diff --git a/workflow-templates/release.yml b/workflow-templates/release.yml index e039556..8bf07cc 100644 --- a/workflow-templates/release.yml +++ b/workflow-templates/release.yml @@ -1,5 +1,5 @@ -# v3.800.35 -# https://virtocommerce.atlassian.net/browse/VCST-5063 +# v3.800.36 +# https://virtocommerce.atlassian.net/browse/VCST-5151 name: Release on: @@ -7,6 +7,6 @@ on: jobs: release: - uses: VirtoCommerce/.github/.github/workflows/release.yml@v3.800.35 + uses: VirtoCommerce/.github/.github/workflows/release.yml@v3.800.36 secrets: envPAT: ${{ secrets.REPO_TOKEN }} \ No newline at end of file From 0e33c487ba55ac8a78dd7f3eb80d8204f9ac5f8b Mon Sep 17 00:00:00 2001 From: Andrew Kubyshkin Date: Thu, 28 May 2026 16:36:32 +0500 Subject: [PATCH 2/2] Cleanup --- workflow-templates/module-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/workflow-templates/module-ci.yml b/workflow-templates/module-ci.yml index 7200cc3..bbb457a 100644 --- a/workflow-templates/module-ci.yml +++ b/workflow-templates/module-ci.yml @@ -240,7 +240,7 @@ jobs: } - name: Swagger validation - uses: VirtoCommerce/vc-github-actions/docker-env@VCST-5054 #master + uses: VirtoCommerce/vc-github-actions/docker-env@master if: ${{ github.ref == 'refs/heads/dev' || (github.event_name == 'pull_request' && github.base_ref == 'dev') }} with: githubUser: ${{ github.actor }}