Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/deploy-cloud.yml
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy-module-workflows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
description: 'Version to deploy'
required: true
type: string
default: 'v3.800.35'
default: 'v3.800.36'

jobs:

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/docker-image-vulnerability-process.yml
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/e2e-autotests.yml
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/e2e.yml
Original file line number Diff line number Diff line change
@@ -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:
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/get-metadata.yml
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/increment-version.yml
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/publish-docker.yml
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/publish-github.yml
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pytest-tests.yml
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test-and-sonar.yml
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ui-autotests.yml
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
40 changes: 27 additions & 13 deletions workflow-templates/module-ci.yml
Original file line number Diff line number Diff line change
@@ -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:
Expand Down Expand Up @@ -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."
}
}
}
Expand All @@ -239,6 +239,20 @@ jobs:
Add-Content -Path $env:GITHUB_OUTPUT -Value "url="
}

- name: Swagger validation
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 }}
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
Expand Down Expand Up @@ -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'
Expand All @@ -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 }}
Expand Down
4 changes: 2 additions & 2 deletions workflow-templates/module-deploy.yml
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
10 changes: 5 additions & 5 deletions workflow-templates/module-release-hotfix.yml
Original file line number Diff line number Diff line change
@@ -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:
Expand All @@ -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'
Expand Down Expand Up @@ -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 }}'
Expand Down
10 changes: 5 additions & 5 deletions workflow-templates/publish-nugets.yml
Original file line number Diff line number Diff line change
@@ -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:
Expand All @@ -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'
Expand All @@ -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
Expand Down
6 changes: 3 additions & 3 deletions workflow-templates/release.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
# v3.800.35
# https://virtocommerce.atlassian.net/browse/VCST-5063
# v3.800.36
# https://virtocommerce.atlassian.net/browse/VCST-5151
name: Release

on:
workflow_dispatch:

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 }}