Skip to content

Commit

Permalink
Merge branch 'release/6.39.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
vc-ci committed Feb 29, 2024
2 parents 323a439 + ecdd6ab commit d43e9f9
Show file tree
Hide file tree
Showing 9 changed files with 44 additions and 38 deletions.
9 changes: 3 additions & 6 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,7 @@ jobs:
run: |
if [ ${{ github.ref }} == 'refs/heads/master' ]; then
echo "IS master branch"
echo "::set-output name=APP::vcst-demo"
elif [ ${{ github.ref }} == 'refs/heads/dev' ]; then
echo "IS dev branch"
echo "::set-output name=APP::vcst-dev"
echo "APP=vcptcore-qa" >> $GITHUB_OUTPUT
fi
- name: Read deployment config
Expand All @@ -66,7 +63,7 @@ jobs:

- name: Update environment
run: |
vc-build SetEnvParameter -EnvironmentName ${{ steps.app-name.outputs.APP }} -CloudToken ${{ secrets.VCST_PLATFORM_TOKEN }} -HelmParameters storefront.image.tag=${{ github.event.inputs.artifactUrl }}
vc-build CloudEnvSetParameter -EnvironmentName ${{ steps.app-name.outputs.APP }} -CloudToken ${{ secrets.VCPTCORE_PLATFORM_TOKEN }} -HelmParameters storefront.image.tag=${{ github.event.inputs.artifactUrl }}
- name: DEPLOY_STATE::successful
if: success()
Expand All @@ -88,7 +85,7 @@ jobs:
- name: Push Deployment Info to Jira
if: ${{ env.CLOUD_INSTANCE_BASE_URL != 0 && env.CLIENT_ID != 0 && env.CLIENT_SECRET != 0 && github.event.inputs.jiraKeys != '' && always() }}
id: push_deployment_info_to_jira
uses: HighwayThree/jira-upload-deployment-info@master
uses: VirtoCommerce/jira-upload-deployment-info@master
env:
CLOUD_INSTANCE_BASE_URL: ${{secrets.CLOUD_INSTANCE_BASE_URL}}
CLIENT_ID: ${{secrets.CLIENT_ID}}
Expand Down
18 changes: 9 additions & 9 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,13 +45,13 @@ jobs:

steps:

- name: Set up Node 18
uses: actions/setup-node@v3
- name: Set up Node 20
uses: actions/setup-node@v4
with:
node-version: '18'
node-version: '20'

- name: Set up Java 17
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: '17'
Expand All @@ -72,7 +72,7 @@ jobs:
run: |
echo "BUILD_DOCKER=true" >> $GITHUB_ENV
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0

Expand Down Expand Up @@ -131,7 +131,7 @@ jobs:
- name: Set artifactUrl value
id: artifactUrl
run: |
echo ::set-output name=DOCKER_URL::${{ env.PACKAGE_SERVER }}/${{github.repository_owner }}/${{ env.IMAGE_NAME }}:${{ steps.image.outputs.taggedVersion }}
echo "DOCKER_URL=${{ env.PACKAGE_SERVER }}/${{github.repository_owner }}/${{ env.IMAGE_NAME }}:${{ steps.image.outputs.taggedVersion }}" >> $GITHUB_OUTPUT
- name: Build Docker Image
if: ${{ env.BUILD_DOCKER == 'true' }}
Expand Down Expand Up @@ -198,7 +198,7 @@ jobs:
- name: Push Build Info to Jira
if: ${{ env.CLOUD_INSTANCE_BASE_URL != 0 && env.CLIENT_ID != 0 && env.CLIENT_SECRET != 0 && steps.jira_keys.outputs.jira-keys != '' && always() }}
id: push_build_info_to_jira
uses: HighwayThree/jira-upload-build-info@master
uses: VirtoCommerce/jira-upload-build-info@master
with:
cloud-instance-base-url: '${{ secrets.CLOUD_INSTANCE_BASE_URL }}'
client-id: '${{ secrets.CLIENT_ID }}'
Expand Down Expand Up @@ -232,9 +232,9 @@ jobs:
id: deployEnv
run: |
if [ '${{ github.ref }}' = 'refs/heads/master' ]; then
echo ::set-output name=NAME::prod
echo "NAME=prod" >> $GITHUB_OUTPUT
else
echo ::set-output name=NAME::dev
echo "NAME=dev" >> $GITHUB_OUTPUT
fi;
- name: Invoke Module deployment workflow
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pr-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@ on:

jobs:
test:
uses: VirtoCommerce/.github/.github/workflows/test-and-sonar.yml@v3.200.36
uses: VirtoCommerce/.github/.github/workflows/test-and-sonar.yml@v3.800.2
secrets:
sonarToken: ${{ secrets.SONAR_TOKEN }}

build:
uses: VirtoCommerce/.github/.github/workflows/build.yml@v3.200.36
uses: VirtoCommerce/.github/.github/workflows/build.yml@v3.800.2
with:
uploadDocker: 'true'
imageName: 'storefront'
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/pr-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
jiraKey: ${{ steps.jiraKey.outputs.qaTaskNumber }}
steps:

- uses: actions/checkout@v2
- uses: actions/checkout@v4

- name: Get Artifact Version
uses: VirtoCommerce/vc-github-actions/get-image-version@master
Expand All @@ -47,7 +47,7 @@ jobs:
publish:
needs:
get-deployment-data
uses: VirtoCommerce/.github/.github/workflows/publish-docker.yml@v3.200.7
uses: VirtoCommerce/.github/.github/workflows/publish-docker.yml@v3.800.2
with:
fullKey: ${{ needs.get-deployment-data.outputs.dockerFullKey }}
shortKey: '${{ needs.get-deployment-data.outputs.dockerShortKey }}-'
Expand All @@ -60,7 +60,7 @@ jobs:
deploy:
needs:
[publish, get-deployment-data]
uses: VirtoCommerce/.github/.github/workflows/deploy.yml@v3.200.7
uses: VirtoCommerce/.github/.github/workflows/deploy.yml@v3.800.2
with:
argoServer: 'argo.govirto.com'
artifactUrl: ${{ needs.publish.outputs.imagePath }}
Expand Down Expand Up @@ -94,10 +94,10 @@ jobs:
with:
artifactUrl: ${{ needs.publish.outputs.imagePath }}

- uses: actions/github-script@v5
- uses: actions/github-script@v7
if: ${{ !(contains('skipped, cancelled', needs.publish.result )) }}
with:
github-token: ${{secrets.GITHUB_TOKEN}}
#github-token: ${{secrets.GITHUB_TOKEN}}
script: |
github.rest.issues.createComment({
issue_number: context.issue.number,
Expand All @@ -121,10 +121,10 @@ jobs:
run: |
echo "MESSAGE_BODY=:heavy_check_mark: Docker image ${{ needs.publish.outputs.imagePath }} deployed to QA" >> $GITHUB_ENV
- uses: actions/github-script@v5
- uses: actions/github-script@v7
if: ${{ !(contains('skipped, cancelled', needs.deploy.result )) }}
with:
github-token: ${{secrets.GITHUB_TOKEN}}
#github-token: ${{secrets.GITHUB_TOKEN}}
script: |
github.rest.issues.createComment({
issue_number: context.issue.number,
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/release-branch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ on:

jobs:
test:
uses: VirtoCommerce/.github/.github/workflows/test-and-sonar.yml@v3.200.5
uses: VirtoCommerce/.github/.github/workflows/test-and-sonar.yml@v3.800.2
secrets:
sonarToken: ${{ secrets.SONAR_TOKEN }}

build:
uses: VirtoCommerce/.github/.github/workflows/build.yml@v3.200.5
uses: VirtoCommerce/.github/.github/workflows/build.yml@v3.800.2
with:
uploadPackage: 'true'
uploadDocker: 'true'
Expand All @@ -44,7 +44,7 @@ jobs:
changelog: ${{ steps.changelog.outputs.changelog }}
steps:

- uses: actions/checkout@v2
- uses: actions/checkout@v4
with:
fetch-depth: 0

Expand All @@ -66,7 +66,7 @@ jobs:
publish-docker:
needs:
[build, test, get-metadata]
uses: VirtoCommerce/.github/.github/workflows/publish-docker.yml@v3.200.5
uses: VirtoCommerce/.github/.github/workflows/publish-docker.yml@v3.800.2
with:
fullKey: ${{ needs.get-metadata.outputs.dockerFullKey }}
shortKey: '${{ needs.get-metadata.outputs.dockerShortKey }}-'
Expand All @@ -80,7 +80,7 @@ jobs:
publish-github-release:
needs:
[build, test, get-metadata]
uses: VirtoCommerce/.github/.github/workflows/publish-github.yml@v3.200.5
uses: VirtoCommerce/.github/.github/workflows/publish-github.yml@v3.800.2
with:
fullKey: ${{ needs.get-metadata.outputs.packageFullKey }}
shortKey: '${{ needs.get-metadata.outputs.packageShortKey }}-'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ on:

jobs:
release:
uses: VirtoCommerce/.github/.github/workflows/release.yml@v3.200
uses: VirtoCommerce/.github/.github/workflows/release.yml@v3.800.2
secrets:
envPAT: ${{ secrets.REPO_TOKEN }}
2 changes: 1 addition & 1 deletion Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<Authors>VirtoCommerce</Authors>
</PropertyGroup>
<PropertyGroup>
<VersionPrefix>6.38.0</VersionPrefix>
<VersionPrefix>6.39.0</VersionPrefix>
<VersionSuffix></VersionSuffix>
<VersionSuffix Condition=" '$(VersionSuffix)' != '' AND '$(BuildNumber)' != '' ">$(VersionSuffix)-$(BuildNumber)</VersionSuffix>
</PropertyGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@
<ItemGroup>
<PackageReference Include="Bogus" Version="34.0.2" />
<FrameworkReference Include="Microsoft.AspNetCore.App" />
<PackageReference Include="coverlet.collector" Version="6.0.1">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.4" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="6.0.4" />
<PackageReference Include="FluentValidation" Version="10.4.0" />
Expand Down
19 changes: 12 additions & 7 deletions VirtoCommerce.Storefront/VirtoCommerce.Storefront.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<PackageLicenseUrl>https://virtocommerce.com/open-source-license</PackageLicenseUrl>
<PackageProjectUrl>https://github.com/VirtoCommerce/vc-storefront</PackageProjectUrl>
<RepositoryUrl>https://github.com/VirtoCommerce/vc-storefront</RepositoryUrl>

<PackageIconUrl>https://virtocommerce.com/themes/assets/logo.jpg</PackageIconUrl>
<PackageReleaseNotes></PackageReleaseNotes>
<TypeScriptToolsVersion>3.1</TypeScriptToolsVersion>
Expand All @@ -20,7 +20,7 @@
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<NoWarn>1701;1702;1591;1573;1570</NoWarn>
</PropertyGroup>

<ItemGroup>
<Compile Remove="JsonConverters\**" />
<Compile Remove="wwwroot\cms-content\**" />
Expand All @@ -45,12 +45,11 @@
<PackageReference Include="IdentityModel" Version="6.0.0" />
<PackageReference Include="FluentValidation" Version="10.4.0" />
<PackageReference Include="FluentValidation.AspNetCore" Version="10.4.0" />

<PackageReference Include="Markdig" Version="0.30.2" />
<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.21.0" />
<PackageReference Include="Microsoft.ApplicationInsights.PerfCounterCollector" Version="2.21.0" />
<PackageReference Include="Microsoft.ApplicationInsights.SnapshotCollector" Version="1.4.3" />
<PackageReference Include="Microsoft.ApplicationInsights.Web" Version="2.21.0" />
<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.22.0" />
<PackageReference Include="Microsoft.ApplicationInsights.PerfCounterCollector" Version="2.22.0" />
<PackageReference Include="Microsoft.ApplicationInsights.SnapshotCollector" Version="1.4.6" />
<PackageReference Include="Microsoft.ApplicationInsights.Web" Version="2.22.0" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.Facebook" Version="6.0.4" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.Google" Version="6.0.4" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.4" />
Expand All @@ -76,6 +75,12 @@
<PackageReference Include="WindowsAzure.Storage" Version="9.3.3" />
</ItemGroup>

<!--Workaround for vulnerable transitive packages-->
<ItemGroup>
<PackageReference Include="System.Net.Http" Version="4.3.4" />
<PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\VirtoCommerce.LiquidThemeEngine\VirtoCommerce.LiquidThemeEngine.csproj" />
<ProjectReference Include="..\VirtoCommerce.Storefront.Model\VirtoCommerce.Storefront.Model.csproj" />
Expand Down

0 comments on commit d43e9f9

Please sign in to comment.