From f9437110984b96577763ceee89d8cfa30c83a601 Mon Sep 17 00:00:00 2001 From: vc-ci Date: Tue, 16 Apr 2024 14:22:21 +0000 Subject: [PATCH 1/4] 3.803.0 --- Directory.Build.props | 2 +- src/VirtoCommerce.EventBusModule.Web/module.manifest | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index 433e839..7246af4 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -2,7 +2,7 @@ - 3.802.0 + 3.803.0 $(VersionSuffix)-$(BuildNumber) diff --git a/src/VirtoCommerce.EventBusModule.Web/module.manifest b/src/VirtoCommerce.EventBusModule.Web/module.manifest index 06627ff..fdbb03b 100644 --- a/src/VirtoCommerce.EventBusModule.Web/module.manifest +++ b/src/VirtoCommerce.EventBusModule.Web/module.manifest @@ -1,7 +1,7 @@ VirtoCommerce.EventBus - 3.802.0 + 3.803.0 3.814.0 From 4b7b07c5eb8691507b874cf38aa2b75f33f3c443 Mon Sep 17 00:00:00 2001 From: vc-ci Date: Thu, 25 Apr 2024 03:39:24 +0000 Subject: [PATCH 2/4] ci: Auto update Github Action workflows --- .github/workflows/module-ci.yml | 34 ++++++++++----------- .github/workflows/module-release-hotfix.yml | 10 +++--- .github/workflows/publish-nugets.yml | 10 +++--- .github/workflows/release.yml | 6 ++-- 4 files changed, 29 insertions(+), 31 deletions(-) diff --git a/.github/workflows/module-ci.yml b/.github/workflows/module-ci.yml index c798dd1..f835ed5 100644 --- a/.github/workflows/module-ci.yml +++ b/.github/workflows/module-ci.yml @@ -1,5 +1,5 @@ -# v3.800.4 -# https://virtocommerce.atlassian.net/browse/VCST-488 +# v3.800.5 +# https://virtocommerce.atlassian.net/browse/VCST-571 name: Module CI on: @@ -15,10 +15,10 @@ on: - '**/cloudDeploy.json' - samples/** branches: - [master, dev] + [master, main, dev] pull_request: branches: - [master, dev] + [master, main, dev] paths-ignore: - 'docs/**' - 'build/**' @@ -69,7 +69,7 @@ jobs: java-version: '17' - name: Set RELEASE_STATUS - if: ${{ github.ref == 'refs/heads/master' && github.event_name == 'push' }} + if: ${{ (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/main') && github.event_name == 'push' }} run: | echo "RELEASE_STATUS=true" >> $GITHUB_ENV @@ -99,7 +99,7 @@ jobs: echo "VERSION_SUFFIX=${{ steps.artifact_ver.outputs.suffix }}" >> $GITHUB_ENV fi; - name: Add version suffix - if: ${{ github.ref != 'refs/heads/master' }} + if: ${{ github.ref != 'refs/heads/master' && github.ref != 'refs/heads/main' }} uses: VirtoCommerce/vc-github-actions/add-version-suffix@master with: versionSuffix: ${{ env.VERSION_SUFFIX }} @@ -128,11 +128,11 @@ jobs: run: vc-build Compress -skip Clean+Restore+Compile+Test - name: Publish Nuget - if: ${{ github.ref == 'refs/heads/master' }} + if: ${{ github.ref == 'refs/heads/master' || github.ref == 'refs/heads/main' }} uses: VirtoCommerce/vc-github-actions/publish-nuget@master - name: Publish to Blob - if: ${{ github.ref == 'refs/heads/master' || github.ref == 'refs/heads/dev' || github.event_name == 'pull_request' || (github.event_name == 'workflow_dispatch' && github.ref != 'refs/heads/master') }} + if: ${{ github.ref == 'refs/heads/master' || github.ref == 'refs/heads/main' || github.ref == 'refs/heads/dev' || github.event_name == 'pull_request' || (github.event_name == 'workflow_dispatch' && github.ref != 'refs/heads/master') || (github.event_name == 'workflow_dispatch' && github.ref != 'refs/heads/main') }} id: blobRelease uses: VirtoCommerce/vc-github-actions/publish-blob-release@master with: @@ -157,7 +157,7 @@ jobs: downloadComment: 'Artifact URL:' - name: Publish Github Release - if: ${{ github.ref == 'refs/heads/master' }} + if: ${{ github.ref == 'refs/heads/master' || github.ref == 'refs/heads/main' }} id: githubRelease with: changelog: ${{ steps.changelog.outputs.changelog }} @@ -167,14 +167,14 @@ jobs: - name: Set artifactUrl value id: artifactUrl run: | - if [ '${{ github.ref }}' = 'refs/heads/master' ]; then + if [ '${{ github.ref }}' = 'refs/heads/master' ] || [ '${{ github.ref }}' = 'refs/heads/main' ]; then echo "download_url=${{ steps.githubRelease.outputs.downloadUrl }}" >> $GITHUB_OUTPUT else echo "download_url=${{ steps.blobRelease.outputs.packageUrl }}" >> $GITHUB_OUTPUT fi; - name: Create deployment matrix - if: ${{ github.ref == 'refs/heads/dev' || github.ref == 'refs/heads/master'}} + if: ${{ github.ref == 'refs/heads/dev' || github.ref == 'refs/heads/master' || github.ref == 'refs/heads/main' }} uses: VirtoCommerce/vc-github-actions/cloud-create-deploy-matrix@master id: deployment-matrix with: @@ -192,13 +192,13 @@ jobs: fi - name: Setup Git Credentials - if: ${{ (github.ref == 'refs/heads/dev' && github.event_name != 'workflow_dispatch') || github.ref == 'refs/heads/master' }} + if: ${{ (github.ref == 'refs/heads/dev' && github.event_name != 'workflow_dispatch') || github.ref == 'refs/heads/master' || github.ref == 'refs/heads/main' }} uses: VirtoCommerce/vc-github-actions/setup-git-credentials-github@master with: githubToken: ${{ secrets.REPO_TOKEN }} - name: Publish Manifest - if: ${{ (github.ref == 'refs/heads/dev' && github.event_name != 'workflow_dispatch') || github.ref == 'refs/heads/master' }} + if: ${{ (github.ref == 'refs/heads/dev' && github.event_name != 'workflow_dispatch') || github.ref == 'refs/heads/master' || github.ref == 'refs/heads/main' }} uses: VirtoCommerce/vc-github-actions/publish-manifest@master with: packageUrl: ${{ steps.artifactUrl.outputs.download_url }} @@ -241,7 +241,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.800.4 + uses: VirtoCommerce/.github/.github/workflows/e2e.yml@v3.800.5 with: katalonRepo: 'VirtoCommerce/vc-quality-gate-katalon' katalonRepoBranch: 'dev' @@ -257,11 +257,9 @@ jobs: katalonApiKey: ${{ secrets.KATALON_API_KEY }} deploy-cloud: - if: ${{ ((github.ref == 'refs/heads/master') || - (github.ref == 'refs/heads/dev')) && - github.event_name == 'push' }} + if: ${{ (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/main' || github.ref == 'refs/heads/dev') && github.event_name == 'push' }} needs: ci - uses: VirtoCommerce/.github/.github/workflows/deploy-cloud.yml@v3.800.4 + uses: VirtoCommerce/.github/.github/workflows/deploy-cloud.yml@v3.800.5 with: releaseSource: module moduleId: ${{ needs.ci.outputs.moduleId }} diff --git a/.github/workflows/module-release-hotfix.yml b/.github/workflows/module-release-hotfix.yml index 3b77412..c966578 100644 --- a/.github/workflows/module-release-hotfix.yml +++ b/.github/workflows/module-release-hotfix.yml @@ -1,5 +1,5 @@ -# v3.800.4 -# https://virtocommerce.atlassian.net/browse/VCST-488 +# v3.800.5 +# https://virtocommerce.atlassian.net/browse/VCST-571 name: Release hotfix on: @@ -13,12 +13,12 @@ on: jobs: test: - uses: VirtoCommerce/.github/.github/workflows/test-and-sonar.yml@v3.800.4 + uses: VirtoCommerce/.github/.github/workflows/test-and-sonar.yml@v3.800.5 secrets: sonarToken: ${{ secrets.SONAR_TOKEN }} build: - uses: VirtoCommerce/.github/.github/workflows/build.yml@v3.800.4 + uses: VirtoCommerce/.github/.github/workflows/build.yml@v3.800.5 with: uploadPackage: 'true' uploadDocker: 'false' @@ -46,7 +46,7 @@ jobs: publish-github-release: needs: [build, test, get-metadata] - uses: VirtoCommerce/.github/.github/workflows/publish-github.yml@v3.800.4 + uses: VirtoCommerce/.github/.github/workflows/publish-github.yml@v3.800.5 with: fullKey: ${{ needs.build.outputs.packageFullKey }} changeLog: '${{ needs.get-metadata.outputs.changeLog }}' diff --git a/.github/workflows/publish-nugets.yml b/.github/workflows/publish-nugets.yml index f84ef4b..c31a678 100644 --- a/.github/workflows/publish-nugets.yml +++ b/.github/workflows/publish-nugets.yml @@ -1,5 +1,5 @@ -# v3.800.4 -# https://virtocommerce.atlassian.net/browse/VCST-488 +# v3.800.5 +# https://virtocommerce.atlassian.net/browse/VCST-571 name: Publish nuget on: @@ -13,12 +13,12 @@ on: jobs: test: - uses: VirtoCommerce/.github/.github/workflows/test-and-sonar.yml@v3.800.4 + uses: VirtoCommerce/.github/.github/workflows/test-and-sonar.yml@v3.800.5 secrets: sonarToken: ${{ secrets.SONAR_TOKEN }} build: - uses: VirtoCommerce/.github/.github/workflows/build.yml@v3.800.4 + uses: VirtoCommerce/.github/.github/workflows/build.yml@v3.800.5 with: uploadPackage: 'true' uploadDocker: 'false' @@ -29,7 +29,7 @@ jobs: publish-nuget: needs: [build, test] - uses: VirtoCommerce/.github/.github/workflows/publish-github.yml@v3.800.4 + uses: VirtoCommerce/.github/.github/workflows/publish-github.yml@v3.800.5 with: fullKey: ${{ needs.build.outputs.packageFullKey }} forceGithub: false diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a0216cc..1b9ed86 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,5 +1,5 @@ -# v3.800.4 -# https://virtocommerce.atlassian.net/browse/VCST-488 +# v3.800.5 +# https://virtocommerce.atlassian.net/browse/VCST-571 name: Release on: @@ -7,6 +7,6 @@ on: jobs: release: - uses: VirtoCommerce/.github/.github/workflows/release.yml@v3.800.4 + uses: VirtoCommerce/.github/.github/workflows/release.yml@v3.800.5 secrets: envPAT: ${{ secrets.REPO_TOKEN }} \ No newline at end of file From c46ae0a99b261192a45d1d71589aa329774919a8 Mon Sep 17 00:00:00 2001 From: vc-ci Date: Wed, 1 May 2024 03:49:13 +0000 Subject: [PATCH 3/4] ci: Auto update Github Action workflows --- .github/workflows/module-ci.yml | 9 +++++---- .github/workflows/module-release-hotfix.yml | 11 ++++++----- .github/workflows/publish-nugets.yml | 10 +++++----- .github/workflows/release.yml | 6 +++--- 4 files changed, 19 insertions(+), 17 deletions(-) diff --git a/.github/workflows/module-ci.yml b/.github/workflows/module-ci.yml index f835ed5..1634061 100644 --- a/.github/workflows/module-ci.yml +++ b/.github/workflows/module-ci.yml @@ -1,5 +1,5 @@ -# v3.800.5 -# https://virtocommerce.atlassian.net/browse/VCST-571 +# v3.800.6 +# https://virtocommerce.atlassian.net/browse/VCST-915 name: Module CI on: @@ -241,7 +241,8 @@ 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.800.5 + uses: VirtoCommerce/.github/.github/workflows/e2e.yml@v3.800.6 + with: katalonRepo: 'VirtoCommerce/vc-quality-gate-katalon' katalonRepoBranch: 'dev' @@ -259,7 +260,7 @@ jobs: deploy-cloud: if: ${{ (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/main' || github.ref == 'refs/heads/dev') && github.event_name == 'push' }} needs: ci - uses: VirtoCommerce/.github/.github/workflows/deploy-cloud.yml@v3.800.5 + uses: VirtoCommerce/.github/.github/workflows/deploy-cloud.yml@v3.800.6 with: releaseSource: module moduleId: ${{ needs.ci.outputs.moduleId }} diff --git a/.github/workflows/module-release-hotfix.yml b/.github/workflows/module-release-hotfix.yml index c966578..9b1b8b4 100644 --- a/.github/workflows/module-release-hotfix.yml +++ b/.github/workflows/module-release-hotfix.yml @@ -1,5 +1,5 @@ -# v3.800.5 -# https://virtocommerce.atlassian.net/browse/VCST-571 +# v3.800.6 +# https://virtocommerce.atlassian.net/browse/VCST-915 name: Release hotfix on: @@ -13,12 +13,12 @@ on: jobs: test: - uses: VirtoCommerce/.github/.github/workflows/test-and-sonar.yml@v3.800.5 + uses: VirtoCommerce/.github/.github/workflows/test-and-sonar.yml@v3.800.6 secrets: sonarToken: ${{ secrets.SONAR_TOKEN }} build: - uses: VirtoCommerce/.github/.github/workflows/build.yml@v3.800.5 + uses: VirtoCommerce/.github/.github/workflows/build.yml@v3.800.6 with: uploadPackage: 'true' uploadDocker: 'false' @@ -46,11 +46,12 @@ jobs: publish-github-release: needs: [build, test, get-metadata] - uses: VirtoCommerce/.github/.github/workflows/publish-github.yml@v3.800.5 + uses: VirtoCommerce/.github/.github/workflows/publish-github.yml@v3.800.6 with: fullKey: ${{ needs.build.outputs.packageFullKey }} changeLog: '${{ needs.get-metadata.outputs.changeLog }}' incrementPatch: ${{ github.event.inputs.incrementPatch }} + makeLatest: 'false' secrets: envPAT: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/publish-nugets.yml b/.github/workflows/publish-nugets.yml index c31a678..4b92b88 100644 --- a/.github/workflows/publish-nugets.yml +++ b/.github/workflows/publish-nugets.yml @@ -1,5 +1,5 @@ -# v3.800.5 -# https://virtocommerce.atlassian.net/browse/VCST-571 +# v3.800.6 +# https://virtocommerce.atlassian.net/browse/VCST-915 name: Publish nuget on: @@ -13,12 +13,12 @@ on: jobs: test: - uses: VirtoCommerce/.github/.github/workflows/test-and-sonar.yml@v3.800.5 + uses: VirtoCommerce/.github/.github/workflows/test-and-sonar.yml@v3.800.6 secrets: sonarToken: ${{ secrets.SONAR_TOKEN }} build: - uses: VirtoCommerce/.github/.github/workflows/build.yml@v3.800.5 + uses: VirtoCommerce/.github/.github/workflows/build.yml@v3.800.6 with: uploadPackage: 'true' uploadDocker: 'false' @@ -29,7 +29,7 @@ jobs: publish-nuget: needs: [build, test] - uses: VirtoCommerce/.github/.github/workflows/publish-github.yml@v3.800.5 + uses: VirtoCommerce/.github/.github/workflows/publish-github.yml@v3.800.6 with: fullKey: ${{ needs.build.outputs.packageFullKey }} forceGithub: false diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 1b9ed86..e2f7f30 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,5 +1,5 @@ -# v3.800.5 -# https://virtocommerce.atlassian.net/browse/VCST-571 +# v3.800.6 +# https://virtocommerce.atlassian.net/browse/VCST-915 name: Release on: @@ -7,6 +7,6 @@ on: jobs: release: - uses: VirtoCommerce/.github/.github/workflows/release.yml@v3.800.5 + uses: VirtoCommerce/.github/.github/workflows/release.yml@v3.800.6 secrets: envPAT: ${{ secrets.REPO_TOKEN }} \ No newline at end of file From aae5e2401c67eb1b4557e8a50504e1678dec943b Mon Sep 17 00:00:00 2001 From: artem-dudarev Date: Thu, 16 May 2024 08:31:19 +0200 Subject: [PATCH 4/4] Update platform --- .../VirtoCommerce.EventBusModule.Core.csproj | 2 +- .../VirtoCommerce.EventBusModule.Data.MySql.csproj | 3 +-- .../VirtoCommerce.EventBusModule.Data.PostgreSql.csproj | 3 +-- .../VirtoCommerce.EventBusModule.Data.SqlServer.csproj | 2 +- .../VirtoCommerce.EventBusModule.Data.csproj | 2 +- src/VirtoCommerce.EventBusModule.Web/module.manifest | 2 +- 6 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/VirtoCommerce.EventBusModule.Core/VirtoCommerce.EventBusModule.Core.csproj b/src/VirtoCommerce.EventBusModule.Core/VirtoCommerce.EventBusModule.Core.csproj index de18fd9..a2cf353 100644 --- a/src/VirtoCommerce.EventBusModule.Core/VirtoCommerce.EventBusModule.Core.csproj +++ b/src/VirtoCommerce.EventBusModule.Core/VirtoCommerce.EventBusModule.Core.csproj @@ -12,6 +12,6 @@ - + diff --git a/src/VirtoCommerce.EventBusModule.Data.MySql/VirtoCommerce.EventBusModule.Data.MySql.csproj b/src/VirtoCommerce.EventBusModule.Data.MySql/VirtoCommerce.EventBusModule.Data.MySql.csproj index 9627f13..cee96a3 100644 --- a/src/VirtoCommerce.EventBusModule.Data.MySql/VirtoCommerce.EventBusModule.Data.MySql.csproj +++ b/src/VirtoCommerce.EventBusModule.Data.MySql/VirtoCommerce.EventBusModule.Data.MySql.csproj @@ -3,14 +3,13 @@ net8.0 enable enable - NU5104 runtime; build; native; contentfiles; analyzers; buildtransitive all - + diff --git a/src/VirtoCommerce.EventBusModule.Data.PostgreSql/VirtoCommerce.EventBusModule.Data.PostgreSql.csproj b/src/VirtoCommerce.EventBusModule.Data.PostgreSql/VirtoCommerce.EventBusModule.Data.PostgreSql.csproj index 461232a..8392a32 100644 --- a/src/VirtoCommerce.EventBusModule.Data.PostgreSql/VirtoCommerce.EventBusModule.Data.PostgreSql.csproj +++ b/src/VirtoCommerce.EventBusModule.Data.PostgreSql/VirtoCommerce.EventBusModule.Data.PostgreSql.csproj @@ -9,8 +9,7 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - - + diff --git a/src/VirtoCommerce.EventBusModule.Data.SqlServer/VirtoCommerce.EventBusModule.Data.SqlServer.csproj b/src/VirtoCommerce.EventBusModule.Data.SqlServer/VirtoCommerce.EventBusModule.Data.SqlServer.csproj index 42f0550..fc58944 100644 --- a/src/VirtoCommerce.EventBusModule.Data.SqlServer/VirtoCommerce.EventBusModule.Data.SqlServer.csproj +++ b/src/VirtoCommerce.EventBusModule.Data.SqlServer/VirtoCommerce.EventBusModule.Data.SqlServer.csproj @@ -9,7 +9,7 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/src/VirtoCommerce.EventBusModule.Data/VirtoCommerce.EventBusModule.Data.csproj b/src/VirtoCommerce.EventBusModule.Data/VirtoCommerce.EventBusModule.Data.csproj index ff54b82..98e1da6 100644 --- a/src/VirtoCommerce.EventBusModule.Data/VirtoCommerce.EventBusModule.Data.csproj +++ b/src/VirtoCommerce.EventBusModule.Data/VirtoCommerce.EventBusModule.Data.csproj @@ -14,7 +14,7 @@ - + diff --git a/src/VirtoCommerce.EventBusModule.Web/module.manifest b/src/VirtoCommerce.EventBusModule.Web/module.manifest index fdbb03b..dc40b5e 100644 --- a/src/VirtoCommerce.EventBusModule.Web/module.manifest +++ b/src/VirtoCommerce.EventBusModule.Web/module.manifest @@ -4,7 +4,7 @@ 3.803.0 - 3.814.0 + 3.825.0 Event Bus module