Skip to content

Commit d43e9f9

Browse files
vc-civc-ci
committed
Merge branch 'release/6.39.0'
2 parents 323a439 + ecdd6ab commit d43e9f9

File tree

9 files changed

+44
-38
lines changed

9 files changed

+44
-38
lines changed

‎.github/workflows/deploy.yml

+3-6
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,7 @@ jobs:
4242
run: |
4343
if [ ${{ github.ref }} == 'refs/heads/master' ]; then
4444
echo "IS master branch"
45-
echo "::set-output name=APP::vcst-demo"
46-
elif [ ${{ github.ref }} == 'refs/heads/dev' ]; then
47-
echo "IS dev branch"
48-
echo "::set-output name=APP::vcst-dev"
45+
echo "APP=vcptcore-qa" >> $GITHUB_OUTPUT
4946
fi
5047
5148
- name: Read deployment config
@@ -66,7 +63,7 @@ jobs:
6663

6764
- name: Update environment
6865
run: |
69-
vc-build SetEnvParameter -EnvironmentName ${{ steps.app-name.outputs.APP }} -CloudToken ${{ secrets.VCST_PLATFORM_TOKEN }} -HelmParameters storefront.image.tag=${{ github.event.inputs.artifactUrl }}
66+
vc-build CloudEnvSetParameter -EnvironmentName ${{ steps.app-name.outputs.APP }} -CloudToken ${{ secrets.VCPTCORE_PLATFORM_TOKEN }} -HelmParameters storefront.image.tag=${{ github.event.inputs.artifactUrl }}
7067
7168
- name: DEPLOY_STATE::successful
7269
if: success()
@@ -88,7 +85,7 @@ jobs:
8885
- name: Push Deployment Info to Jira
8986
if: ${{ env.CLOUD_INSTANCE_BASE_URL != 0 && env.CLIENT_ID != 0 && env.CLIENT_SECRET != 0 && github.event.inputs.jiraKeys != '' && always() }}
9087
id: push_deployment_info_to_jira
91-
uses: HighwayThree/jira-upload-deployment-info@master
88+
uses: VirtoCommerce/jira-upload-deployment-info@master
9289
env:
9390
CLOUD_INSTANCE_BASE_URL: ${{secrets.CLOUD_INSTANCE_BASE_URL}}
9491
CLIENT_ID: ${{secrets.CLIENT_ID}}

‎.github/workflows/main.yml

+9-9
Original file line numberDiff line numberDiff line change
@@ -45,13 +45,13 @@ jobs:
4545

4646
steps:
4747

48-
- name: Set up Node 18
49-
uses: actions/setup-node@v3
48+
- name: Set up Node 20
49+
uses: actions/setup-node@v4
5050
with:
51-
node-version: '18'
51+
node-version: '20'
5252

5353
- name: Set up Java 17
54-
uses: actions/setup-java@v3
54+
uses: actions/setup-java@v4
5555
with:
5656
distribution: 'temurin'
5757
java-version: '17'
@@ -72,7 +72,7 @@ jobs:
7272
run: |
7373
echo "BUILD_DOCKER=true" >> $GITHUB_ENV
7474
75-
- uses: actions/checkout@v3
75+
- uses: actions/checkout@v4
7676
with:
7777
fetch-depth: 0
7878

@@ -131,7 +131,7 @@ jobs:
131131
- name: Set artifactUrl value
132132
id: artifactUrl
133133
run: |
134-
echo ::set-output name=DOCKER_URL::${{ env.PACKAGE_SERVER }}/${{github.repository_owner }}/${{ env.IMAGE_NAME }}:${{ steps.image.outputs.taggedVersion }}
134+
echo "DOCKER_URL=${{ env.PACKAGE_SERVER }}/${{github.repository_owner }}/${{ env.IMAGE_NAME }}:${{ steps.image.outputs.taggedVersion }}" >> $GITHUB_OUTPUT
135135
136136
- name: Build Docker Image
137137
if: ${{ env.BUILD_DOCKER == 'true' }}
@@ -198,7 +198,7 @@ jobs:
198198
- name: Push Build Info to Jira
199199
if: ${{ env.CLOUD_INSTANCE_BASE_URL != 0 && env.CLIENT_ID != 0 && env.CLIENT_SECRET != 0 && steps.jira_keys.outputs.jira-keys != '' && always() }}
200200
id: push_build_info_to_jira
201-
uses: HighwayThree/jira-upload-build-info@master
201+
uses: VirtoCommerce/jira-upload-build-info@master
202202
with:
203203
cloud-instance-base-url: '${{ secrets.CLOUD_INSTANCE_BASE_URL }}'
204204
client-id: '${{ secrets.CLIENT_ID }}'
@@ -232,9 +232,9 @@ jobs:
232232
id: deployEnv
233233
run: |
234234
if [ '${{ github.ref }}' = 'refs/heads/master' ]; then
235-
echo ::set-output name=NAME::prod
235+
echo "NAME=prod" >> $GITHUB_OUTPUT
236236
else
237-
echo ::set-output name=NAME::dev
237+
echo "NAME=dev" >> $GITHUB_OUTPUT
238238
fi;
239239
240240
- name: Invoke Module deployment workflow

‎.github/workflows/pr-ci.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@ on:
1515

1616
jobs:
1717
test:
18-
uses: VirtoCommerce/.github/.github/workflows/test-and-sonar.yml@v3.200.36
18+
uses: VirtoCommerce/.github/.github/workflows/test-and-sonar.yml@v3.800.2
1919
secrets:
2020
sonarToken: ${{ secrets.SONAR_TOKEN }}
2121

2222
build:
23-
uses: VirtoCommerce/.github/.github/workflows/build.yml@v3.200.36
23+
uses: VirtoCommerce/.github/.github/workflows/build.yml@v3.800.2
2424
with:
2525
uploadDocker: 'true'
2626
imageName: 'storefront'

‎.github/workflows/pr-deploy.yml

+7-7
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
jiraKey: ${{ steps.jiraKey.outputs.qaTaskNumber }}
2525
steps:
2626

27-
- uses: actions/checkout@v2
27+
- uses: actions/checkout@v4
2828

2929
- name: Get Artifact Version
3030
uses: VirtoCommerce/vc-github-actions/get-image-version@master
@@ -47,7 +47,7 @@ jobs:
4747
publish:
4848
needs:
4949
get-deployment-data
50-
uses: VirtoCommerce/.github/.github/workflows/publish-docker.yml@v3.200.7
50+
uses: VirtoCommerce/.github/.github/workflows/publish-docker.yml@v3.800.2
5151
with:
5252
fullKey: ${{ needs.get-deployment-data.outputs.dockerFullKey }}
5353
shortKey: '${{ needs.get-deployment-data.outputs.dockerShortKey }}-'
@@ -60,7 +60,7 @@ jobs:
6060
deploy:
6161
needs:
6262
[publish, get-deployment-data]
63-
uses: VirtoCommerce/.github/.github/workflows/deploy.yml@v3.200.7
63+
uses: VirtoCommerce/.github/.github/workflows/deploy.yml@v3.800.2
6464
with:
6565
argoServer: 'argo.govirto.com'
6666
artifactUrl: ${{ needs.publish.outputs.imagePath }}
@@ -94,10 +94,10 @@ jobs:
9494
with:
9595
artifactUrl: ${{ needs.publish.outputs.imagePath }}
9696

97-
- uses: actions/github-script@v5
97+
- uses: actions/github-script@v7
9898
if: ${{ !(contains('skipped, cancelled', needs.publish.result )) }}
9999
with:
100-
github-token: ${{secrets.GITHUB_TOKEN}}
100+
#github-token: ${{secrets.GITHUB_TOKEN}}
101101
script: |
102102
github.rest.issues.createComment({
103103
issue_number: context.issue.number,
@@ -121,10 +121,10 @@ jobs:
121121
run: |
122122
echo "MESSAGE_BODY=:heavy_check_mark: Docker image ${{ needs.publish.outputs.imagePath }} deployed to QA" >> $GITHUB_ENV
123123
124-
- uses: actions/github-script@v5
124+
- uses: actions/github-script@v7
125125
if: ${{ !(contains('skipped, cancelled', needs.deploy.result )) }}
126126
with:
127-
github-token: ${{secrets.GITHUB_TOKEN}}
127+
#github-token: ${{secrets.GITHUB_TOKEN}}
128128
script: |
129129
github.rest.issues.createComment({
130130
issue_number: context.issue.number,

‎.github/workflows/release-branch.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@ on:
1414

1515
jobs:
1616
test:
17-
uses: VirtoCommerce/.github/.github/workflows/test-and-sonar.yml@v3.200.5
17+
uses: VirtoCommerce/.github/.github/workflows/test-and-sonar.yml@v3.800.2
1818
secrets:
1919
sonarToken: ${{ secrets.SONAR_TOKEN }}
2020

2121
build:
22-
uses: VirtoCommerce/.github/.github/workflows/build.yml@v3.200.5
22+
uses: VirtoCommerce/.github/.github/workflows/build.yml@v3.800.2
2323
with:
2424
uploadPackage: 'true'
2525
uploadDocker: 'true'
@@ -44,7 +44,7 @@ jobs:
4444
changelog: ${{ steps.changelog.outputs.changelog }}
4545
steps:
4646

47-
- uses: actions/checkout@v2
47+
- uses: actions/checkout@v4
4848
with:
4949
fetch-depth: 0
5050

@@ -66,7 +66,7 @@ jobs:
6666
publish-docker:
6767
needs:
6868
[build, test, get-metadata]
69-
uses: VirtoCommerce/.github/.github/workflows/publish-docker.yml@v3.200.5
69+
uses: VirtoCommerce/.github/.github/workflows/publish-docker.yml@v3.800.2
7070
with:
7171
fullKey: ${{ needs.get-metadata.outputs.dockerFullKey }}
7272
shortKey: '${{ needs.get-metadata.outputs.dockerShortKey }}-'
@@ -80,7 +80,7 @@ jobs:
8080
publish-github-release:
8181
needs:
8282
[build, test, get-metadata]
83-
uses: VirtoCommerce/.github/.github/workflows/publish-github.yml@v3.200.5
83+
uses: VirtoCommerce/.github/.github/workflows/publish-github.yml@v3.800.2
8484
with:
8585
fullKey: ${{ needs.get-metadata.outputs.packageFullKey }}
8686
shortKey: '${{ needs.get-metadata.outputs.packageShortKey }}-'

‎.github/workflows/release.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@ on:
66

77
jobs:
88
release:
9-
uses: VirtoCommerce/.github/.github/workflows/release.yml@v3.200
9+
uses: VirtoCommerce/.github/.github/workflows/release.yml@v3.800.2
1010
secrets:
1111
envPAT: ${{ secrets.REPO_TOKEN }}

‎Directory.Build.props

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<Authors>VirtoCommerce</Authors>
88
</PropertyGroup>
99
<PropertyGroup>
10-
<VersionPrefix>6.38.0</VersionPrefix>
10+
<VersionPrefix>6.39.0</VersionPrefix>
1111
<VersionSuffix></VersionSuffix>
1212
<VersionSuffix Condition=" '$(VersionSuffix)' != '' AND '$(BuildNumber)' != '' ">$(VersionSuffix)-$(BuildNumber)</VersionSuffix>
1313
</PropertyGroup>

‎VirtoCommerce.Storefront.Tests/VirtoCommerce.Storefront.Tests.csproj

+4
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@
99
<ItemGroup>
1010
<PackageReference Include="Bogus" Version="34.0.2" />
1111
<FrameworkReference Include="Microsoft.AspNetCore.App" />
12+
<PackageReference Include="coverlet.collector" Version="6.0.1">
13+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
14+
<PrivateAssets>all</PrivateAssets>
15+
</PackageReference>
1216
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.4" />
1317
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="6.0.4" />
1418
<PackageReference Include="FluentValidation" Version="10.4.0" />

‎VirtoCommerce.Storefront/VirtoCommerce.Storefront.csproj

+12-7
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<PackageLicenseUrl>https://virtocommerce.com/open-source-license</PackageLicenseUrl>
99
<PackageProjectUrl>https://github.com/VirtoCommerce/vc-storefront</PackageProjectUrl>
1010
<RepositoryUrl>https://github.com/VirtoCommerce/vc-storefront</RepositoryUrl>
11-
11+
1212
<PackageIconUrl>https://virtocommerce.com/themes/assets/logo.jpg</PackageIconUrl>
1313
<PackageReleaseNotes></PackageReleaseNotes>
1414
<TypeScriptToolsVersion>3.1</TypeScriptToolsVersion>
@@ -20,7 +20,7 @@
2020
<GenerateDocumentationFile>true</GenerateDocumentationFile>
2121
<NoWarn>1701;1702;1591;1573;1570</NoWarn>
2222
</PropertyGroup>
23-
23+
2424
<ItemGroup>
2525
<Compile Remove="JsonConverters\**" />
2626
<Compile Remove="wwwroot\cms-content\**" />
@@ -45,12 +45,11 @@
4545
<PackageReference Include="IdentityModel" Version="6.0.0" />
4646
<PackageReference Include="FluentValidation" Version="10.4.0" />
4747
<PackageReference Include="FluentValidation.AspNetCore" Version="10.4.0" />
48-
4948
<PackageReference Include="Markdig" Version="0.30.2" />
50-
<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.21.0" />
51-
<PackageReference Include="Microsoft.ApplicationInsights.PerfCounterCollector" Version="2.21.0" />
52-
<PackageReference Include="Microsoft.ApplicationInsights.SnapshotCollector" Version="1.4.3" />
53-
<PackageReference Include="Microsoft.ApplicationInsights.Web" Version="2.21.0" />
49+
<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.22.0" />
50+
<PackageReference Include="Microsoft.ApplicationInsights.PerfCounterCollector" Version="2.22.0" />
51+
<PackageReference Include="Microsoft.ApplicationInsights.SnapshotCollector" Version="1.4.6" />
52+
<PackageReference Include="Microsoft.ApplicationInsights.Web" Version="2.22.0" />
5453
<PackageReference Include="Microsoft.AspNetCore.Authentication.Facebook" Version="6.0.4" />
5554
<PackageReference Include="Microsoft.AspNetCore.Authentication.Google" Version="6.0.4" />
5655
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.4" />
@@ -76,6 +75,12 @@
7675
<PackageReference Include="WindowsAzure.Storage" Version="9.3.3" />
7776
</ItemGroup>
7877

78+
<!--Workaround for vulnerable transitive packages-->
79+
<ItemGroup>
80+
<PackageReference Include="System.Net.Http" Version="4.3.4" />
81+
<PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
82+
</ItemGroup>
83+
7984
<ItemGroup>
8085
<ProjectReference Include="..\VirtoCommerce.LiquidThemeEngine\VirtoCommerce.LiquidThemeEngine.csproj" />
8186
<ProjectReference Include="..\VirtoCommerce.Storefront.Model\VirtoCommerce.Storefront.Model.csproj" />

0 commit comments

Comments
 (0)