Skip to content

Commit

Permalink
Merge branch 'release/4.1.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
vc-ci committed Mar 14, 2023
2 parents 9c07188 + bdc6f3e commit 4ad8e67
Show file tree
Hide file tree
Showing 9 changed files with 2,069 additions and 4,402 deletions.
13 changes: 9 additions & 4 deletions .github/workflows/module-ci.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# v3.200.20
# v3.200.24
name: Module CI

on:
Expand Down Expand Up @@ -56,6 +56,11 @@ jobs:

steps:

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

- name: Set RELEASE_STATUS
if: ${{ github.ref == 'refs/heads/master' && github.event_name == 'push' }}
run: |
Expand Down Expand Up @@ -234,7 +239,7 @@ jobs:
if: ${{ ((github.ref == 'refs/heads/dev') && (github.event_name == 'push') && (needs.ci.outputs.run-e2e == 'true')) ||
(github.event_name == 'workflow_dispatch')}}
needs: 'ci'
uses: VirtoCommerce/.github/.github/workflows/e2e.yml@v3.200.20
uses: VirtoCommerce/.github/.github/workflows/e2e.yml@v3.200.24
with:
katalonRepo: 'VirtoCommerce/vc-quality-gate-katalon'
katalonRepoBranch: 'dev'
Expand All @@ -254,7 +259,7 @@ jobs:
(github.ref == 'refs/heads/dev')) &&
github.event_name == 'push' }}
needs: ci
uses: VirtoCommerce/.github/.github/workflows/deploy-cloud.yml@v3.200.20
uses: VirtoCommerce/.github/.github/workflows/deploy-cloud.yml@v3.200.24
with:
releaseSource: module
moduleId: ${{ needs.ci.outputs.moduleId }}
Expand All @@ -263,4 +268,4 @@ jobs:
jiraKeys: ${{ needs.ci.outputs.jira-keys }}
argoServer: 'argo.virtocommerce.cloud'
matrix: '{"include":${{ needs.ci.outputs.matrix }}}'
secrets: inherit
secrets: inherit
8 changes: 4 additions & 4 deletions .github/workflows/module-release-hotfix.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# v3.200.20
# v3.200.24
name: Release hotfix

on:
Expand All @@ -12,12 +12,12 @@ on:

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

build:
uses: VirtoCommerce/.github/.github/workflows/build.yml@v3.200.20
uses: VirtoCommerce/.github/.github/workflows/build.yml@v3.200.24
with:
uploadPackage: 'true'
uploadDocker: 'false'
Expand All @@ -43,7 +43,7 @@ jobs:
publish-github-release:
needs:
[build, test, get-metadata]
uses: VirtoCommerce/.github/.github/workflows/publish-github.yml@v3.200.20
uses: VirtoCommerce/.github/.github/workflows/publish-github.yml@v3.200.24
with:
fullKey: ${{ needs.build.outputs.packageFullKey }}
changeLog: '${{ needs.get-metadata.outputs.changeLog }}'
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/publish-nugets.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# v3.200.20
# v3.200.24
name: Publish nuget

on:
Expand All @@ -12,12 +12,12 @@ on:

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

build:
uses: VirtoCommerce/.github/.github/workflows/build.yml@v3.200.20
uses: VirtoCommerce/.github/.github/workflows/build.yml@v3.200.24
with:
uploadPackage: 'true'
uploadDocker: 'false'
Expand All @@ -28,7 +28,7 @@ jobs:
publish-nuget:
needs:
[build, test]
uses: VirtoCommerce/.github/.github/workflows/publish-github.yml@v3.200.20
uses: VirtoCommerce/.github/.github/workflows/publish-github.yml@v3.200.24
with:
fullKey: ${{ needs.build.outputs.packageFullKey }}
forceGithub: false
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# v3.200.20
# v3.200.24
name: Release

on:
workflow_dispatch:

jobs:
release:
uses: VirtoCommerce/.github/.github/workflows/release.yml@v3.200.20
uses: VirtoCommerce/.github/.github/workflows/release.yml@v3.200.24
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 @@ -2,7 +2,7 @@
<Project>
<!-- These properties will be shared for all projects -->
<PropertyGroup>
<VersionPrefix>4.0.0</VersionPrefix>
<VersionPrefix>4.1.0</VersionPrefix>
<VersionSuffix>
</VersionSuffix>
<VersionSuffix Condition=" '$(VersionSuffix)' != '' AND '$(BuildNumber)' != '' ">$(VersionSuffix)-$(BuildNumber)</VersionSuffix>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,27 +1,27 @@
<?xml version="1.0" encoding="utf-8"?>
<module xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<id>VirtoCommerce.GoogleEcommerceAnalytics</id>
<version>4.0.0</version>
<version-tag />
<platformVersion>3.200.0</platformVersion>
<title>Google Analytics 4</title>
<description>Allows you active Measurement Id for a Store and measure traffic and ecommerce events to collect information about the shopping behavior of your users.</description>
<authors>
<author>Oleg Zhuk</author>
</authors>
<owners>
<owner>Virto Commerce</owner>
</owners>
<projectUrl>https://virtocommerce.com/apps/extensions/google-ecommerce-analytics-module</projectUrl>
<iconUrl>Modules/$(VirtoCommerce.GoogleEcommerceAnalytics)/Content/logo.png</iconUrl>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<releaseNotes>First version.</releaseNotes>
<copyright>Copyright © 2011-2022 Virto Commerce. All rights reserved</copyright>
<tags>analytics</tags>
<assemblyFile>VirtoCommerce.GoogleEcommerceAnalyticsModule.Web.dll</assemblyFile>
<moduleType>VirtoCommerce.GoogleEcommerceAnalyticsModule.Web.Module, VirtoCommerce.GoogleEcommerceAnalyticsModule.Web</moduleType>
<dependencies>
<dependency id="VirtoCommerce.Store" version="3.200.0" />
</dependencies>
<useFullTypeNameInSwagger>false</useFullTypeNameInSwagger>
<id>VirtoCommerce.GoogleEcommerceAnalytics</id>
<version>4.1.0</version>
<version-tag />
<platformVersion>3.200.0</platformVersion>
<title>Google Analytics 4</title>
<description>Allows you active Measurement Id for a Store and measure traffic and ecommerce events to collect information about the shopping behavior of your users.</description>
<authors>
<author>Oleg Zhuk</author>
</authors>
<owners>
<owner>Virto Commerce</owner>
</owners>
<projectUrl>https://virtocommerce.com/apps/extensions/google-ecommerce-analytics-module</projectUrl>
<iconUrl>Modules/$(VirtoCommerce.GoogleEcommerceAnalytics)/Content/logo.png</iconUrl>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<releaseNotes>First version.</releaseNotes>
<copyright>Copyright © 2011-2022 Virto Commerce. All rights reserved</copyright>
<tags>analytics</tags>
<assemblyFile>VirtoCommerce.GoogleEcommerceAnalyticsModule.Web.dll</assemblyFile>
<moduleType>VirtoCommerce.GoogleEcommerceAnalyticsModule.Web.Module, VirtoCommerce.GoogleEcommerceAnalyticsModule.Web</moduleType>
<dependencies>
<dependency id="VirtoCommerce.Store" version="3.200.0" />
</dependencies>
<useFullTypeNameInSwagger>false</useFullTypeNameInSwagger>
</module>
Loading

0 comments on commit 4ad8e67

Please sign in to comment.