-
Notifications
You must be signed in to change notification settings - Fork 21
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'dev' into feature/VCST-2012
- Loading branch information
Showing
16 changed files
with
2,756 additions
and
455 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 |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| # v3.800.9 | ||
| # https://virtocommerce.atlassian.net/browse/VCST-1260 | ||
| # v3.800.10 | ||
| # https://virtocommerce.atlassian.net/browse/VCST-1738 | ||
| name: Module CI | ||
|
|
||
| on: | ||
|
|
@@ -239,9 +239,9 @@ jobs: | |
| module-katalon-tests: | ||
| if: ${{ ((github.ref == 'refs/heads/dev') && (github.event_name == 'push') && (needs.ci.outputs.run-e2e == 'true')) || | ||
| (github.event_name == 'workflow_dispatch')}} | ||
| (github.event_name == 'workflow_dispatch') || (github.base_ref == 'dev') && (github.event_name == 'pull_request') }} | ||
| needs: 'ci' | ||
| uses: VirtoCommerce/.github/.github/workflows/[email protected].9 | ||
| uses: VirtoCommerce/.github/.github/workflows/[email protected].10 | ||
|
|
||
| with: | ||
| katalonRepo: 'VirtoCommerce/vc-quality-gate-katalon' | ||
|
|
@@ -260,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/[email protected].9 | ||
| uses: VirtoCommerce/.github/.github/workflows/[email protected].10 | ||
| with: | ||
| releaseSource: module | ||
| moduleId: ${{ needs.ci.outputs.moduleId }} | ||
|
|
||
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,5 +1,5 @@ | ||
| # v3.800.9 | ||
| # https://virtocommerce.atlassian.net/browse/VCST-1260 | ||
| # v3.800.10 | ||
| # https://virtocommerce.atlassian.net/browse/VCST-1738 | ||
| name: Release hotfix | ||
|
|
||
| on: | ||
|
|
@@ -13,12 +13,12 @@ on: | |
|
|
||
| jobs: | ||
| test: | ||
| uses: VirtoCommerce/.github/.github/workflows/[email protected].9 | ||
| uses: VirtoCommerce/.github/.github/workflows/[email protected].10 | ||
| secrets: | ||
| sonarToken: ${{ secrets.SONAR_TOKEN }} | ||
|
|
||
| build: | ||
| uses: VirtoCommerce/.github/.github/workflows/[email protected].9 | ||
| uses: VirtoCommerce/.github/.github/workflows/[email protected].10 | ||
| with: | ||
| uploadPackage: 'true' | ||
| uploadDocker: 'false' | ||
|
|
@@ -46,7 +46,7 @@ jobs: | |
| publish-github-release: | ||
| needs: | ||
| [build, test, get-metadata] | ||
| uses: VirtoCommerce/.github/.github/workflows/[email protected].9 | ||
| uses: VirtoCommerce/.github/.github/workflows/[email protected].10 | ||
| with: | ||
| fullKey: ${{ needs.build.outputs.packageFullKey }} | ||
| changeLog: '${{ needs.get-metadata.outputs.changeLog }}' | ||
|
|
||
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,5 +1,5 @@ | ||
| # v3.800.9 | ||
| # https://virtocommerce.atlassian.net/browse/VCST-1260 | ||
| # v3.800.10 | ||
| # https://virtocommerce.atlassian.net/browse/VCST-1738 | ||
| name: Publish nuget | ||
|
|
||
| on: | ||
|
|
@@ -13,12 +13,12 @@ on: | |
|
|
||
| jobs: | ||
| test: | ||
| uses: VirtoCommerce/.github/.github/workflows/[email protected].9 | ||
| uses: VirtoCommerce/.github/.github/workflows/[email protected].10 | ||
| secrets: | ||
| sonarToken: ${{ secrets.SONAR_TOKEN }} | ||
|
|
||
| build: | ||
| uses: VirtoCommerce/.github/.github/workflows/[email protected].9 | ||
| uses: VirtoCommerce/.github/.github/workflows/[email protected].10 | ||
| with: | ||
| uploadPackage: 'true' | ||
| uploadDocker: 'false' | ||
|
|
@@ -29,7 +29,7 @@ jobs: | |
| publish-nuget: | ||
| needs: | ||
| [build, test] | ||
| uses: VirtoCommerce/.github/.github/workflows/[email protected].9 | ||
| uses: VirtoCommerce/.github/.github/workflows/[email protected].10 | ||
| with: | ||
| fullKey: ${{ needs.build.outputs.packageFullKey }} | ||
| forceGithub: false | ||
|
|
||
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,12 +1,12 @@ | ||
| # v3.800.9 | ||
| # https://virtocommerce.atlassian.net/browse/VCST-1260 | ||
| # v3.800.10 | ||
| # https://virtocommerce.atlassian.net/browse/VCST-1738 | ||
| name: Release | ||
|
|
||
| on: | ||
| workflow_dispatch: | ||
|
|
||
| jobs: | ||
| release: | ||
| uses: VirtoCommerce/.github/.github/workflows/[email protected].9 | ||
| uses: VirtoCommerce/.github/.github/workflows/[email protected].10 | ||
| secrets: | ||
| envPAT: ${{ secrets.REPO_TOKEN }} |
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
Oops, something went wrong.