Skip to content

Commit ed4f146

Browse files
committed
Merge branch 'release/3.808.0'
2 parents 82d0bc8 + dbb84c4 commit ed4f146

File tree

12 files changed

+77
-43
lines changed

12 files changed

+77
-43
lines changed

.github/workflows/module-ci.yml

Lines changed: 47 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
# v3.800.17
2-
# https://virtocommerce.atlassian.net/browse/VCST-2789
1+
# v3.800.22
2+
# https://virtocommerce.atlassian.net/browse/VCST-4203
33
name: Module CI
44

55
on:
@@ -27,11 +27,11 @@ on:
2727
- '**/argoDeploy.json'
2828
- '**/cloudDeploy.json'
2929
- samples/**
30-
30+
3131
jobs:
3232
ci:
33-
if: ${{ github.actor != 'dependabot[bot]' &&
34-
(github.event.pull_request.head.repo.full_name == github.repository ||
33+
if: ${{ github.actor != 'dependabot[bot]' &&
34+
(github.event.pull_request.head.repo.full_name == github.repository ||
3535
github.event.pull_request.head.repo.full_name == '') }} # Check that PR not from forked repo and not from Dependabot
3636
runs-on: ubuntu-24.04
3737
env:
@@ -56,6 +56,7 @@ jobs:
5656
run-e2e: ${{ steps.run-e2e.outputs.result }}
5757
run-ui-tests: ${{ steps.run-ui-tests.outputs.result }}
5858
deployment-folder-exists: ${{ steps.check_deployment_folder.outputs.exists }}
59+
requiredModulesListUrl: ${{ steps.extract_required_modules_list_url_from_pr.outputs.url }}
5960

6061
steps:
6162

@@ -140,7 +141,7 @@ jobs:
140141

141142
- name: Packaging
142143
run: vc-build Compress -skip Clean+Restore+Compile+Test
143-
144+
144145
- name: Publish Nuget
145146
if: ${{ github.ref == 'refs/heads/master' || github.ref == 'refs/heads/main' }}
146147
uses: VirtoCommerce/vc-github-actions/publish-nuget@master
@@ -152,7 +153,7 @@ jobs:
152153
with:
153154
blobSAS: ${{ secrets.BLOB_TOKEN }}
154155
blobUrl: ${{ vars.BLOB_URL }}
155-
156+
156157
- name: Add Jira link
157158
if: ${{ github.event_name == 'pull_request' }}
158159
uses: VirtoCommerce/vc-github-actions/publish-jira-link@master
@@ -177,7 +178,7 @@ jobs:
177178
changelog: ${{ steps.changelog.outputs.changelog }}
178179
organization: ${{ github.repository_owner }}
179180
uses: VirtoCommerce/vc-github-actions/publish-github-release@master
180-
181+
181182
- name: Set artifactUrl value
182183
id: artifactUrl
183184
run: |
@@ -200,13 +201,43 @@ jobs:
200201
env:
201202
COMMIT_MESSAGE: ${{ github.event.head_commit.message }}
202203
run: |
203-
if [[ "$COMMIT_MESSAGE" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]];
204+
if [[ "$COMMIT_MESSAGE" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]];
204205
then
205206
echo "result=false" >> $GITHUB_OUTPUT
206207
else
207208
echo "result=true" >> $GITHUB_OUTPUT
208209
fi
209210
211+
- name: Extract required modules list URL from the pull request description
212+
if: ${{ github.event_name == 'pull_request' }}
213+
id: extract_required_modules_list_url_from_pr
214+
shell: pwsh
215+
env:
216+
PR_BODY: ${{ github.event.pull_request.body }}
217+
run: |
218+
$text = $env:PR_BODY
219+
$marker = 'Required modules list URL'
220+
221+
$url = ''
222+
if ($null -ne $text -and $text.Contains($marker)) {
223+
$startIndex = $text.IndexOf($marker)
224+
if ($startIndex -ge 0) {
225+
$slice = $text.Substring($startIndex)
226+
$match = [regex]::Match($slice, 'https?://[^ )\r\n]+')
227+
if ($match.Success) {
228+
$url = $match.Value
229+
}
230+
}
231+
}
232+
233+
if ([string]::IsNullOrWhiteSpace($url) -eq $false) {
234+
Write-Host "url found: $url"
235+
Add-Content -Path $env:GITHUB_OUTPUT -Value "url=$url"
236+
} else {
237+
Write-Host "url NOT found"
238+
Add-Content -Path $env:GITHUB_OUTPUT -Value "url="
239+
}
240+
210241
- name: Look for xapi module in dependencies
211242
id: run-ui-tests
212243
shell: pwsh
@@ -231,9 +262,9 @@ jobs:
231262
- name: Setup Git Credentials
232263
if: ${{ (github.ref == 'refs/heads/dev' && github.event_name != 'workflow_dispatch') || github.ref == 'refs/heads/master' || github.ref == 'refs/heads/main' }}
233264
uses: VirtoCommerce/vc-github-actions/setup-git-credentials-github@master
234-
with:
265+
with:
235266
githubToken: ${{ secrets.REPO_TOKEN }}
236-
267+
237268
- name: Publish Manifest
238269
if: ${{ (github.ref == 'refs/heads/dev' && github.event_name != 'workflow_dispatch') || github.ref == 'refs/heads/master' || github.ref == 'refs/heads/main' }}
239270
uses: VirtoCommerce/vc-github-actions/publish-manifest@master
@@ -278,7 +309,7 @@ jobs:
278309
if: ${{ ((github.ref == 'refs/heads/dev') && (github.event_name == 'push')) ||
279310
(github.event_name == 'workflow_dispatch') || ((github.base_ref == 'dev') && (github.event_name == 'pull_request')) }}
280311
needs: 'ci'
281-
uses: VirtoCommerce/.github/.github/workflows/ui-autotests.yml@v3.800.17
312+
uses: VirtoCommerce/.github/.github/workflows/ui-autotests.yml@v3.800.22
282313
with:
283314
installModules: 'false'
284315
installCustomModule: 'true'
@@ -290,12 +321,12 @@ jobs:
290321
secrets:
291322
envPAT: ${{ secrets.REPO_TOKEN }}
292323
testSecretEnvFile: ${{ secrets.VC_TESTING_MODULE_ENV_FILE }}
293-
324+
294325
module-katalon-tests:
295326
if: ${{ ((github.ref == 'refs/heads/dev') && (github.event_name == 'push') && (needs.ci.outputs.run-e2e == 'true')) ||
296327
(github.event_name == 'workflow_dispatch') || (github.base_ref == 'dev') && (github.event_name == 'pull_request') }}
297328
needs: 'ci'
298-
uses: VirtoCommerce/.github/.github/workflows/e2e.yml@v3.800.17
329+
uses: VirtoCommerce/.github/.github/workflows/e2e.yml@v3.800.22
299330
with:
300331
katalonRepo: 'VirtoCommerce/vc-quality-gate-katalon'
301332
katalonRepoBranch: 'dev'
@@ -304,6 +335,7 @@ jobs:
304335
installCustomModule: 'true'
305336
customModuleId: ${{ needs.ci.outputs.moduleId }}
306337
customModuleUrl: ${{ needs.ci.outputs.artifactUrl }}
338+
requiredModulesListUrl: ${{ needs.ci.outputs.requiredModulesListUrl }}
307339
platformDockerTag: 'dev-linux-latest'
308340
storefrontDockerTag: 'dev-linux-latest'
309341
secrets:
@@ -315,7 +347,7 @@ jobs:
315347
&& github.event_name == 'push'
316348
&& needs.ci.outputs.deployment-folder-exists == 'true'}}
317349
needs: ci
318-
uses: VirtoCommerce/.github/.github/workflows/deploy-cloud.yml@v3.800.17
350+
uses: VirtoCommerce/.github/.github/workflows/deploy-cloud.yml@v3.800.22
319351
with:
320352
releaseSource: module
321353
moduleId: ${{ needs.ci.outputs.moduleId }}

.github/workflows/module-release-hotfix.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
# v3.800.17
2-
# https://virtocommerce.atlassian.net/browse/VCST-2789
1+
# v3.800.22
2+
# https://virtocommerce.atlassian.net/browse/VCST-4203
33
name: Release hotfix
44

55
on:
@@ -13,12 +13,12 @@ on:
1313

1414
jobs:
1515
test:
16-
uses: VirtoCommerce/.github/.github/workflows/test-and-sonar.yml@v3.800.17
16+
uses: VirtoCommerce/.github/.github/workflows/test-and-sonar.yml@v3.800.22
1717
secrets:
1818
sonarToken: ${{ secrets.SONAR_TOKEN }}
1919

2020
build:
21-
uses: VirtoCommerce/.github/.github/workflows/build.yml@v3.800.17
21+
uses: VirtoCommerce/.github/.github/workflows/build.yml@v3.800.22
2222
with:
2323
uploadPackage: 'true'
2424
uploadDocker: 'false'
@@ -46,7 +46,7 @@ jobs:
4646
publish-github-release:
4747
needs:
4848
[build, test, get-metadata]
49-
uses: VirtoCommerce/.github/.github/workflows/publish-github.yml@v3.800.17
49+
uses: VirtoCommerce/.github/.github/workflows/publish-github.yml@v3.800.22
5050
with:
5151
fullKey: ${{ needs.build.outputs.packageFullKey }}
5252
changeLog: '${{ needs.get-metadata.outputs.changeLog }}'

.github/workflows/publish-nugets.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
# v3.800.17
2-
# https://virtocommerce.atlassian.net/browse/VCST-2789
1+
# v3.800.22
2+
# https://virtocommerce.atlassian.net/browse/VCST-4203
33
name: Publish nuget
44

55
on:
@@ -13,12 +13,12 @@ on:
1313

1414
jobs:
1515
test:
16-
uses: VirtoCommerce/.github/.github/workflows/test-and-sonar.yml@v3.800.17
16+
uses: VirtoCommerce/.github/.github/workflows/test-and-sonar.yml@v3.800.22
1717
secrets:
1818
sonarToken: ${{ secrets.SONAR_TOKEN }}
1919

2020
build:
21-
uses: VirtoCommerce/.github/.github/workflows/build.yml@v3.800.17
21+
uses: VirtoCommerce/.github/.github/workflows/build.yml@v3.800.22
2222
with:
2323
uploadPackage: 'true'
2424
uploadDocker: 'false'
@@ -29,7 +29,7 @@ jobs:
2929
publish-nuget:
3030
needs:
3131
[build, test]
32-
uses: VirtoCommerce/.github/.github/workflows/publish-github.yml@v3.800.17
32+
uses: VirtoCommerce/.github/.github/workflows/publish-github.yml@v3.800.22
3333
with:
3434
fullKey: ${{ needs.build.outputs.packageFullKey }}
3535
forceGithub: false

.github/workflows/release.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
# v3.800.17
2-
# https://virtocommerce.atlassian.net/browse/VCST-2789
1+
# v3.800.22
2+
# https://virtocommerce.atlassian.net/browse/VCST-4203
33
name: Release
44

55
on:
66
workflow_dispatch:
77

88
jobs:
99
release:
10-
uses: VirtoCommerce/.github/.github/workflows/release.yml@v3.800.17
10+
uses: VirtoCommerce/.github/.github/workflows/release.yml@v3.800.22
1111
secrets:
1212
envPAT: ${{ secrets.REPO_TOKEN }}

Directory.Build.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<Project>
33
<!-- These properties will be shared for all projects -->
44
<PropertyGroup>
5-
<VersionPrefix>3.807.0</VersionPrefix>
5+
<VersionPrefix>3.808.0</VersionPrefix>
66
<VersionSuffix>
77
</VersionSuffix>
88
<VersionSuffix Condition=" '$(VersionSuffix)' != '' AND '$(BuildNumber)' != '' ">$(VersionSuffix)-$(BuildNumber)</VersionSuffix>

src/VirtoCommerce.ExportModule.Core/VirtoCommerce.ExportModule.Core.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@
1414
</PropertyGroup>
1515
<ItemGroup>
1616
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
17-
<PackageReference Include="VirtoCommerce.Platform.Core" Version="3.853.0" />
17+
<PackageReference Include="VirtoCommerce.Platform.Core" Version="3.917.0" />
1818
</ItemGroup>
1919
</Project>

src/VirtoCommerce.ExportModule.Data/Services/ExportProviderFactory.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public virtual IExportProvider CreateProvider(ExportDataRequest exportDataReques
2323
throw new ArgumentNullException(nameof(exportDataRequest));
2424
}
2525

26-
var result = _providerFactories.FirstOrDefault(x => x(exportDataRequest).TypeName.EqualsInvariant(exportDataRequest.ProviderName));
26+
var result = _providerFactories.FirstOrDefault(x => x(exportDataRequest).TypeName.EqualsIgnoreCase(exportDataRequest.ProviderName));
2727

2828
return result != null ? result(exportDataRequest) : null;
2929
}

src/VirtoCommerce.ExportModule.Data/Services/KnownExportTypesService.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public ExportedTypeDefinition RegisterType(ExportedTypeDefinition exportedTypeDe
2929

3030
public ExportedTypeDefinition ResolveExportedTypeDefinition(string typeName)
3131
{
32-
return _knownExportTypes.Values.FirstOrDefault(x => x.TypeName.EqualsInvariant(typeName));
32+
return _knownExportTypes.Values.FirstOrDefault(x => x.TypeName.EqualsIgnoreCase(typeName));
3333
}
3434
}
3535
}

src/VirtoCommerce.ExportModule.Data/VirtoCommerce.ExportModule.Data.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
</PropertyGroup>
1616
<ItemGroup>
1717
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
18-
<PackageReference Include="VirtoCommerce.AssetsModule.Core" Version="3.808.0" />
18+
<PackageReference Include="VirtoCommerce.AssetsModule.Core" Version="3.814.0" />
1919
<ProjectReference Include="..\VirtoCommerce.ExportModule.Core\VirtoCommerce.ExportModule.Core.csproj" />
2020
</ItemGroup>
2121
</Project>

src/VirtoCommerce.ExportModule.Web/VirtoCommerce.ExportModule.Web.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@
2121
<None Remove="node_modules\**" />
2222
</ItemGroup>
2323
<ItemGroup>
24-
<PackageReference Include="FluentValidation" Version="11.10.0" />
25-
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.8" />
26-
<PackageReference Include="VirtoCommerce.Platform.Hangfire" Version="3.853.0" />
24+
<PackageReference Include="FluentValidation" Version="11.11.0" />
25+
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="[8.0.11,9)" />
26+
<PackageReference Include="VirtoCommerce.Platform.Hangfire" Version="3.917.0" />
2727
</ItemGroup>
2828
<ItemGroup>
2929
<ProjectReference Include="..\VirtoCommerce.ExportModule.Core\VirtoCommerce.ExportModule.Core.csproj" />

0 commit comments

Comments
 (0)