Skip to content

Commit

Permalink
Merge branch 'release/3.214.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
vc-ci committed Mar 14, 2023
2 parents 569ca64 + 63f3143 commit b3b83a5
Show file tree
Hide file tree
Showing 9 changed files with 2,061 additions and 4,110 deletions.
15 changes: 5 additions & 10 deletions .github/workflows/module-ci.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# v3.200.22
# v3.200.24
name: Module CI

on:
Expand Down Expand Up @@ -56,10 +56,10 @@ jobs:

steps:

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

- name: Set RELEASE_STATUS
if: ${{ github.ref == 'refs/heads/master' && github.event_name == 'push' }}
Expand All @@ -70,11 +70,6 @@ jobs:
with:
fetch-depth: 0

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

- name: Install VirtoCommerce.GlobalTool
uses: VirtoCommerce/vc-github-actions/setup-vcbuild@master

Expand Down Expand Up @@ -244,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/[email protected].22
uses: VirtoCommerce/.github/.github/workflows/[email protected].24
with:
katalonRepo: 'VirtoCommerce/vc-quality-gate-katalon'
katalonRepoBranch: 'dev'
Expand All @@ -264,7 +259,7 @@ jobs:
(github.ref == 'refs/heads/dev')) &&
github.event_name == 'push' }}
needs: ci
uses: VirtoCommerce/.github/.github/workflows/[email protected].22
uses: VirtoCommerce/.github/.github/workflows/[email protected].24
with:
releaseSource: module
moduleId: ${{ needs.ci.outputs.moduleId }}
Expand Down
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.22
# v3.200.24
name: Release hotfix

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

jobs:
test:
uses: VirtoCommerce/.github/.github/workflows/[email protected].22
uses: VirtoCommerce/.github/.github/workflows/[email protected].24
secrets:
sonarToken: ${{ secrets.SONAR_TOKEN }}

build:
uses: VirtoCommerce/.github/.github/workflows/[email protected].22
uses: VirtoCommerce/.github/.github/workflows/[email protected].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/[email protected].22
uses: VirtoCommerce/.github/.github/workflows/[email protected].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.22
# v3.200.24
name: Publish nuget

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

jobs:
test:
uses: VirtoCommerce/.github/.github/workflows/[email protected].22
uses: VirtoCommerce/.github/.github/workflows/[email protected].24
secrets:
sonarToken: ${{ secrets.SONAR_TOKEN }}

build:
uses: VirtoCommerce/.github/.github/workflows/[email protected].22
uses: VirtoCommerce/.github/.github/workflows/[email protected].24
with:
uploadPackage: 'true'
uploadDocker: 'false'
Expand All @@ -28,7 +28,7 @@ jobs:
publish-nuget:
needs:
[build, test]
uses: VirtoCommerce/.github/.github/workflows/[email protected].22
uses: VirtoCommerce/.github/.github/workflows/[email protected].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.22
# v3.200.24
name: Release

on:
workflow_dispatch:

jobs:
release:
uses: VirtoCommerce/.github/.github/workflows/[email protected].22
uses: VirtoCommerce/.github/.github/workflows/[email protected].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>3.213.0</VersionPrefix>
<VersionPrefix>3.214.0</VersionPrefix>
<VersionSuffix>
</VersionSuffix>
<VersionSuffix Condition=" '$(VersionSuffix)' != '' AND '$(BuildNumber)' != '' ">$(VersionSuffix)-$(BuildNumber)</VersionSuffix>
Expand Down
2 changes: 1 addition & 1 deletion src/VirtoCommerce.InventoryModule.Web/module.manifest
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?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.Inventory</id>
<version>3.213.0</version>
<version>3.214.0</version>
<version-tag />
<platformVersion>3.218.0</platformVersion>
<title>Inventory module</title>
Expand Down
Loading

0 comments on commit b3b83a5

Please sign in to comment.