-
Notifications
You must be signed in to change notification settings - Fork 10
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'release/3.12.0' into master
- Loading branch information
Showing
18 changed files
with
292 additions
and
141 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| ## Description | ||
|
|
||
| ## References | ||
| ### QA-test: | ||
| ### Jira-link: | ||
| ### Artifact URL: |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,43 @@ | ||
| # v1.0 | ||
|
|
||
| name: Deploy to environments | ||
| on: | ||
| pull_request: | ||
| paths-ignore: | ||
| - '.github/**' | ||
| - 'docs/**' | ||
| - 'build/**' | ||
| - 'README.md' | ||
| - 'LICENSE' | ||
| branches: [dev] | ||
| types: [labeled, closed] | ||
|
|
||
| jobs: | ||
| deploy: | ||
| runs-on: ubuntu-latest | ||
| env: | ||
| GITHUB_TOKEN: ${{ secrets.REPO_TOKEN }} | ||
|
|
||
| steps: | ||
| - name: Read deployment config | ||
| if: contains(github.event.pull_request.labels.*.name, 'deploy-qa') | ||
| uses: VirtoCommerce/vc-github-actions/get-deploy-param@master | ||
| id: deployConfig | ||
|
|
||
| - name: Gets artifact link | ||
| if: contains(github.event.pull_request.labels.*.name, 'deploy-qa') | ||
| uses: VirtoCommerce/vc-github-actions/get-artifact-link@master | ||
| id: artifactLink | ||
| with: | ||
| downloadComment: 'Artifact URL:' | ||
|
|
||
| - name: Create deploy PR in QA | ||
| if: github.event.action != 'closed' && contains(github.event.pull_request.labels.*.name, 'deploy-qa') | ||
| uses: VirtoCommerce/vc-github-actions/create-deploy-pr@master | ||
| with: | ||
| deployRepo: ${{ steps.deployConfig.outputs.deployRepo }} | ||
| deployBranch: ${{ fromJSON(steps.deployConfig.outputs.deployConfig).qa.deployBranch }} | ||
| artifactKey: ${{ steps.deployConfig.outputs.artifactKey }} | ||
| artifactUrl: ${{ steps.artifactLink.outputs.artifactUrl }} | ||
| taskNumber: ${{ steps.artifactLink.outputs.qaTaskNumber }} | ||
| cmPath: ${{ steps.deployConfig.outputs.cmPath }} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,78 @@ | ||
| # v1.0 | ||
|
|
||
| name: VC deployment | ||
| on: | ||
| workflow_dispatch: | ||
| inputs: | ||
| artifactUrl: | ||
| description: 'Full link to artifact docker image or artifact download url' | ||
| required: true | ||
| deployBranch: | ||
| description: 'ArgoCd branch name' | ||
| required: true | ||
| default: 'dev' | ||
|
|
||
| jobs: | ||
| cd: | ||
| runs-on: ubuntu-latest | ||
| env: | ||
| GITHUB_TOKEN: ${{ secrets.REPO_TOKEN }} | ||
|
|
||
| steps: | ||
|
|
||
| - name: Read deployment config | ||
| uses: VirtoCommerce/vc-github-actions/get-deploy-param@master | ||
| id: deployConfig | ||
| with: | ||
| envName: ${{ github.event.inputs.deployBranch }} | ||
|
|
||
| - name: Start deployment | ||
| uses: bobheadxi/deployments@master | ||
| id: deployment | ||
| with: | ||
| step: start | ||
| token: ${{ secrets.GITHUB_TOKEN }} | ||
| env: Development | ||
| no_override: false | ||
|
|
||
| - name: Update deployment-cm | ||
| uses: VirtoCommerce/vc-github-actions/create-deploy-pr@master | ||
| with: | ||
| deployRepo: ${{ steps.deployConfig.outputs.deployRepo }} | ||
| deployBranch: ${{ steps.deployConfig.outputs.deployBranch }} | ||
| artifactKey: ${{ steps.deployConfig.outputs.artifactKey }} | ||
| artifactUrl: ${{ github.event.inputs.artifactUrl }} | ||
| taskNumber: "undefined" | ||
| forceCommit: "true" | ||
| cmPath: ${{ steps.deployConfig.outputs.cmPath }} | ||
|
|
||
| - name: Wait for environment is up | ||
| shell: pwsh | ||
| timeout-minutes: 15 | ||
| run: | | ||
| do { | ||
| Start-Sleep -s 15 | ||
| $statusBage = (Invoke-WebRequest -Uri "https://argo.govirto.com/api/badge?name=${{ steps.deployConfig.outputs.deployAppName }}").Content | ||
| $syncedAndHealthy = $statusBage.Contains('>Healthy<') -and $statusBage.Contains('>Synced<') | ||
| if (-not $syncedAndHealthy) { | ||
| Write-Host "Sync pending..." | ||
| } | ||
| } | ||
| while (-not $syncedAndHealthy) | ||
| - name: BUILD_STATE::successful | ||
| if: success() | ||
| run: echo "BUILD_STATE=successful" >> $GITHUB_ENV | ||
|
|
||
| - name: BUILD_STATE::failed | ||
| if: failure() | ||
| run: echo "BUILD_STATE=failed" >> $GITHUB_ENV | ||
|
|
||
| - name: Update GitHub deployment status | ||
| uses: bobheadxi/deployments@master | ||
| if: always() | ||
| with: | ||
| step: finish | ||
| token: ${{ secrets.GITHUB_TOKEN }} | ||
| status: ${{ job.status }} | ||
| deployment_id: ${{ steps.deployment.outputs.deployment_id }} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,54 @@ | ||
| name: Send message to Teams (regression PR) | ||
|
|
||
| on: | ||
| pull_request: | ||
| branches: | ||
| [regression] | ||
|
|
||
| jobs: | ||
| notify: | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
|
|
||
| - name: Send a message to Microsoft Teams | ||
| uses: VirtoCommerce/vc-github-actions/msteams-send-message@master | ||
| with: | ||
| body: '{ | ||
| "@type": "MessageCard", | ||
| "@context": "http://schema.org/extensions", | ||
| "themeColor": "0076D7", | ||
| "summary": "On ${{github.repository}} repository", | ||
| "sections": [ | ||
| { | ||
| "activityTitle": "Regression PR created/updated", | ||
| "activitySubtitle": "By [${{ github.event.pull_request.user.login }}](${{ github.event.pull_request.user.url }}) on **[${{github.repository}}](${{github.server_url}}/${{github.repository}})** repository", | ||
| "activityImage":"${{ github.event.pull_request.user.avatar_url }}", | ||
| "facts": [ | ||
| { | ||
| "name": "Repository", | ||
| "value": "[${{github.repository}}](${{github.server_url}}/${{github.repository}})" | ||
| }, | ||
| { | ||
| "name": "Pull request", | ||
| "value": "[${{ github.event.pull_request.number }}](${{ github.event.pull_request._links.html.href }})" | ||
| }, | ||
| { | ||
| "name": "Pull request title", | ||
| "value": "${{ github.event.pull_request.title }}" | ||
| } | ||
| ], | ||
| "markdown": true | ||
| } | ||
| ], | ||
| "potentialAction": [ { | ||
| "@type": "OpenUri", | ||
| "name": "View Pull Request", | ||
| "targets": [{ | ||
| "os": "default", | ||
| "uri": "${{ github.event.pull_request._links.html.href }}" | ||
| }] | ||
| }] | ||
| }' # the body of the message | ||
| webhook_uri: ${{ secrets.PLATFORM_TEAMS_URI }} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
27 changes: 16 additions & 11 deletions
27
src/VirtoCommerce.SubscriptionModule.Core/VirtoCommerce.SubscriptionModule.Core.csproj
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,13 +1,18 @@ | ||
| <Project Sdk="Microsoft.NET.Sdk"> | ||
| <PropertyGroup> | ||
| <TargetFramework>netcoreapp3.1</TargetFramework> | ||
| <GenerateDocumentationFile>true</GenerateDocumentationFile> | ||
| <noWarn>1591</noWarn> | ||
| <IsPackable>True</IsPackable> | ||
| </PropertyGroup> | ||
| <ItemGroup> | ||
| <PackageReference Include="VirtoCommerce.CoreModule.Core" Version="3.1.0" /> | ||
| <PackageReference Include="VirtoCommerce.OrdersModule.Core" Version="3.1.0" /> | ||
| <PackageReference Include="VirtoCommerce.Platform.Core" Version="3.13.0" /> | ||
| </ItemGroup> | ||
| <PropertyGroup> | ||
| <TargetFramework>netcoreapp3.1</TargetFramework> | ||
| <GenerateDocumentationFile>true</GenerateDocumentationFile> | ||
| <noWarn>1591</noWarn> | ||
| <IsPackable>True</IsPackable> | ||
| <PublishRepositoryUrl>true</PublishRepositoryUrl> | ||
| <EmbedUntrackedSources>true</EmbedUntrackedSources> | ||
| <IncludeSymbols>true</IncludeSymbols> | ||
| <SymbolPackageFormat>snupkg</SymbolPackageFormat> | ||
| </PropertyGroup> | ||
| <ItemGroup> | ||
| <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" /> | ||
| <PackageReference Include="VirtoCommerce.CoreModule.Core" Version="3.1.0" /> | ||
| <PackageReference Include="VirtoCommerce.OrdersModule.Core" Version="3.1.0" /> | ||
| <PackageReference Include="VirtoCommerce.Platform.Core" Version="3.51.0" /> | ||
| </ItemGroup> | ||
| </Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
71 changes: 38 additions & 33 deletions
71
src/VirtoCommerce.SubscriptionModule.Data/VirtoCommerce.SubscriptionModule.Data.csproj
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,35 +1,40 @@ | ||
| <Project Sdk="Microsoft.NET.Sdk"> | ||
| <PropertyGroup> | ||
| <TargetFramework>netcoreapp3.1</TargetFramework> | ||
| <GenerateDocumentationFile>true</GenerateDocumentationFile> | ||
| <noWarn>1591</noWarn> | ||
| <LangVersion>latest</LangVersion> | ||
| <IsPackable>True</IsPackable> | ||
| </PropertyGroup> | ||
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'"> | ||
| <NoWarn>1701;1702;1705;1591</NoWarn> | ||
| </PropertyGroup> | ||
| <ItemGroup> | ||
| <ProjectReference Include="..\VirtoCommerce.SubscriptionModule.Core\VirtoCommerce.SubscriptionModule.Core.csproj" /> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <PackageReference Include="FluentValidation" Version="8.6.2" /> | ||
| <PackageReference Include="Hangfire" Version="1.7.9" /> | ||
| <PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.1.8" /> | ||
| <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="3.1.8"> | ||
| <PrivateAssets>all</PrivateAssets> | ||
| <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> | ||
| </PackageReference> | ||
| <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="3.1.8" /> | ||
| <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="3.1.8" /> | ||
| <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="3.1.8"> | ||
| <PrivateAssets>all</PrivateAssets> | ||
| <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> | ||
| </PackageReference> | ||
| <PackageReference Include="VirtoCommerce.OrdersModule.Core" Version="3.1.0" /> | ||
| <PackageReference Include="VirtoCommerce.NotificationsModule.Core" Version="3.14.0" /> | ||
| <PackageReference Include="VirtoCommerce.Platform.Data" Version="3.13.0" /> | ||
| <PackageReference Include="VirtoCommerce.CustomerModule.Core" Version="3.1.0" /> | ||
| <PackageReference Include="VirtoCommerce.StoreModule.Core" Version="3.17.0" /> | ||
| </ItemGroup> | ||
| <PropertyGroup> | ||
| <TargetFramework>netcoreapp3.1</TargetFramework> | ||
| <GenerateDocumentationFile>true</GenerateDocumentationFile> | ||
| <noWarn>1591</noWarn> | ||
| <LangVersion>latest</LangVersion> | ||
| <IsPackable>True</IsPackable> | ||
| <PublishRepositoryUrl>true</PublishRepositoryUrl> | ||
| <EmbedUntrackedSources>true</EmbedUntrackedSources> | ||
| <IncludeSymbols>true</IncludeSymbols> | ||
| <SymbolPackageFormat>snupkg</SymbolPackageFormat> | ||
| </PropertyGroup> | ||
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'"> | ||
| <NoWarn>1701;1702;1705;1591</NoWarn> | ||
| </PropertyGroup> | ||
| <ItemGroup> | ||
| <ProjectReference Include="..\VirtoCommerce.SubscriptionModule.Core\VirtoCommerce.SubscriptionModule.Core.csproj" /> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <PackageReference Include="FluentValidation" Version="8.6.3" /> | ||
| <PackageReference Include="Hangfire" Version="1.7.9" /> | ||
| <PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.1.8" /> | ||
| <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="3.1.8"> | ||
| <PrivateAssets>all</PrivateAssets> | ||
| <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> | ||
| </PackageReference> | ||
| <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="3.1.8" /> | ||
| <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="3.1.8" /> | ||
| <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="3.1.8"> | ||
| <PrivateAssets>all</PrivateAssets> | ||
| <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> | ||
| </PackageReference> | ||
| <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" /> | ||
| <PackageReference Include="VirtoCommerce.OrdersModule.Core" Version="3.1.0" /> | ||
| <PackageReference Include="VirtoCommerce.NotificationsModule.Core" Version="3.14.0" /> | ||
| <PackageReference Include="VirtoCommerce.Platform.Data" Version="3.51.0" /> | ||
| <PackageReference Include="VirtoCommerce.CustomerModule.Core" Version="3.1.0" /> | ||
| <PackageReference Include="VirtoCommerce.StoreModule.Core" Version="3.17.0" /> | ||
| </ItemGroup> | ||
| </Project> |
Oops, something went wrong.