-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
53 changed files
with
2,402 additions
and
1,125 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
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,4 +1,4 @@ | ||
| # v3.200.16 | ||
| # v3.200.20 | ||
| name: Module CI | ||
|
|
||
| on: | ||
|
|
@@ -47,9 +47,12 @@ jobs: | |
|
|
||
| outputs: | ||
| artifactUrl: ${{ steps.artifactUrl.outputs.download_url }} | ||
| blobId: ${{ steps.blobRelease.outputs.blobId }} | ||
| jira-keys: ${{ steps.jira_keys.outputs.jira-keys }} | ||
| version: ${{ steps.artifact_ver.outputs.shortVersion }} | ||
| moduleId: ${{ steps.artifact_ver.outputs.moduleId }} | ||
| matrix: ${{ steps.deployment-matrix.outputs.matrix }} | ||
| run-e2e: ${{ steps.run-e2e.outputs.result }} | ||
|
|
||
| steps: | ||
|
|
||
|
|
@@ -114,7 +117,7 @@ jobs: | |
| uses: VirtoCommerce/vc-github-actions/publish-nuget@master | ||
|
|
||
| - name: Publish to Blob | ||
| if: ${{ 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/dev' || github.event_name == 'pull_request' || (github.event_name == 'workflow_dispatch' && github.ref != 'refs/heads/master') }} | ||
| id: blobRelease | ||
| uses: VirtoCommerce/vc-github-actions/publish-blob-release@master | ||
| with: | ||
|
|
@@ -151,6 +154,24 @@ jobs: | |
| echo ::set-output name=download_url::${{ steps.blobRelease.outputs.packageUrl }} | ||
| fi; | ||
| - name: Create deployment matrix | ||
| if: ${{ github.ref == 'refs/heads/dev' || github.ref == 'refs/heads/master'}} | ||
| uses: VirtoCommerce/vc-github-actions/cloud-create-deploy-matrix@master | ||
| id: deployment-matrix | ||
| with: | ||
| deployConfigPath: '.deployment/module/cloudDeploy.json' | ||
| releaseBranch: 'master' | ||
|
|
||
| - name: Check commit message for version number | ||
| id: run-e2e | ||
| run: | | ||
| if [[ "${{ github.event.head_commit.message }}" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; | ||
| then | ||
| echo "::set-output name=result::false" | ||
| else | ||
| echo "::set-output name=result::true" | ||
| fi | ||
| - name: Setup Git Credentials | ||
| if: ${{ (github.ref == 'refs/heads/dev' || github.ref == 'refs/heads/master') && github.event_name != 'workflow_dispatch' }} | ||
| uses: VirtoCommerce/vc-github-actions/setup-git-credentials-github@master | ||
|
|
@@ -161,7 +182,7 @@ jobs: | |
| if: ${{ (github.ref == 'refs/heads/dev' || github.ref == 'refs/heads/master') && github.event_name != 'workflow_dispatch' }} | ||
| uses: VirtoCommerce/vc-github-actions/publish-manifest@master | ||
| with: | ||
| packageUrl: ${{ steps.blobRelease.outputs.packageUrl }} | ||
| packageUrl: ${{ steps.artifactUrl.outputs.download_url }} | ||
|
|
||
| - name: Update virtocommerce.com | ||
| if: ${{ github.ref == 'refs/heads/master' }} | ||
|
|
@@ -209,113 +230,11 @@ jobs: | |
| run: | | ||
| echo "Jira Upload Build Info response: ${{ steps.push_build_info_to_jira.outputs.response }}" | ||
| deploy: | ||
| if: ${{ (github.ref == 'refs/heads/dev' || github.ref == 'refs/heads/master') && github.event_name == 'push' }} | ||
| needs: ci | ||
| runs-on: ubuntu-20.04 | ||
| env: | ||
| GITHUB_TOKEN: ${{ secrets.REPO_TOKEN }} | ||
| CLOUD_INSTANCE_BASE_URL: ${{secrets.CLOUD_INSTANCE_BASE_URL}} | ||
| CLIENT_ID: ${{secrets.CLIENT_ID}} | ||
| CLIENT_SECRET: ${{secrets.CLIENT_SECRET}} | ||
| DEPLOYMENT_ENV: 'dev' | ||
| SLEEP_TIME: '5m' | ||
| ARGO_SERVER: 'argo.govirto.com' | ||
|
|
||
| steps: | ||
| - name: Set DEPLOYMENT_ENV variable | ||
| if: ${{ github.ref == 'refs/heads/master' }} | ||
| run: echo "DEPLOYMENT_ENV=prod" >> $GITHUB_ENV | ||
|
|
||
| - name: Read deployment config | ||
| uses: VirtoCommerce/vc-github-actions/get-deploy-param@master | ||
| id: deployConfig | ||
| with: | ||
| envName: ${{ env.DEPLOYMENT_ENV }} | ||
| deployConfigPath: '.deployment/module/argoDeploy.json' | ||
|
|
||
| - name: Start deployment | ||
| uses: bobheadxi/deployments@master | ||
| id: deployment | ||
| with: | ||
| step: start | ||
| token: ${{ secrets.GITHUB_TOKEN }} | ||
| env: ${{ steps.deployConfig.outputs.environmentName }} | ||
| 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: ${{ needs.ci.outputs.artifactUrl }} | ||
| taskNumber: 'undefined' | ||
| forceCommit: 'true' | ||
| cmPath: ${{ steps.deployConfig.outputs.cmPath }} | ||
|
|
||
| - name: Sleep for ${{ env.SLEEP_TIME }} | ||
| run: sleep ${{ env.SLEEP_TIME }} | ||
| shell: bash | ||
|
|
||
| - name: Wait for environment is up | ||
| uses: VirtoCommerce/vc-github-actions/vc-argocd-cli@master | ||
| timeout-minutes: 10 | ||
| id: argocd-cli | ||
| with: | ||
| server: ${{env.ARGO_SERVER}} | ||
| username: ${{ secrets.ARGOCD_LOGIN }} | ||
| password: ${{ secrets.ARGOCD_PASSWORD }} | ||
| command: app wait ${{ steps.deployConfig.outputs.deployAppName }} | ||
|
|
||
| - name: DEPLOY_STATE::successful | ||
| if: success() | ||
| run: echo "DEPLOY_STATE=successful" >> $GITHUB_ENV | ||
|
|
||
| - name: DEPLOY_STATE::failed | ||
| if: failure() | ||
| run: echo "DEPLOY_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 }} | ||
|
|
||
| - name: Push Deployment Info to Jira | ||
| if: ${{ env.CLOUD_INSTANCE_BASE_URL != 0 && env.CLIENT_ID != 0 && env.CLIENT_SECRET != 0 && needs.ci.outputs.jira-keys != '' && always() }} | ||
| id: push_deployment_info_to_jira | ||
| uses: HighwayThree/jira-upload-deployment-info@master | ||
| env: | ||
| CLOUD_INSTANCE_BASE_URL: ${{secrets.CLOUD_INSTANCE_BASE_URL}} | ||
| CLIENT_ID: ${{secrets.CLIENT_ID}} | ||
| CLIENT_SECRET: ${{secrets.CLIENT_SECRET}} | ||
| with: | ||
| cloud-instance-base-url: ${{ secrets.CLOUD_INSTANCE_BASE_URL }} | ||
| client-id: ${{ secrets.CLIENT_ID }} | ||
| client-secret: ${{ secrets.CLIENT_SECRET }} | ||
| deployment-sequence-number: ${{ github.run_id }} | ||
| update-sequence-number: ${{ github.run_id }} | ||
| issue-keys: ${{ needs.ci.outputs.jira-keys }} | ||
| display-name: ${{ steps.deployConfig.outputs.deployAppName }} | ||
| url: ${{ steps.deployConfig.outputs.environmentUrl }} | ||
| description: 'Deployment to the ${{ steps.deployConfig.outputs.environmentName }} environment' | ||
| last-updated: '${{github.event.head_commit.timestamp}}' | ||
| state: '${{ env.DEPLOY_STATE }}' | ||
| pipeline-id: '${{ github.repository }} ${{ github.workflow }}' | ||
| pipeline-display-name: 'Workflow: ${{ github.workflow }} (#${{ github.run_number }})' | ||
| pipeline-url: '${{github.event.repository.html_url}}/actions/runs/${{github.run_id}}' | ||
| environment-id: ${{ steps.deployConfig.outputs.environmentId }} | ||
| environment-display-name: ${{ steps.deployConfig.outputs.environmentName }} | ||
| environment-type: ${{ steps.deployConfig.outputs.environmentType }} | ||
|
|
||
| module-katalon-tests: | ||
| if: ${{ (github.ref == 'refs/heads/dev') && github.event_name == 'push' }} | ||
| 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@main | ||
| uses: VirtoCommerce/.github/.github/workflows/e2e.yml@v3.200.20 | ||
| with: | ||
| katalonRepo: 'VirtoCommerce/vc-quality-gate-katalon' | ||
| katalonRepoBranch: 'dev' | ||
|
|
@@ -324,22 +243,24 @@ jobs: | |
| installCustomModule: 'true' | ||
| customModuleId: ${{ needs.ci.outputs.moduleId }} | ||
| customModuleUrl: ${{ needs.ci.outputs.artifactUrl }} | ||
| platformDockerTag: 'dev-linux-latest' | ||
| storefrontDockerTag: 'dev-linux-latest' | ||
| secrets: | ||
| envPAT: ${{ secrets.REPO_TOKEN }} | ||
| katalonApiKey: ${{ secrets.KATALON_API_KEY }} | ||
|
|
||
| deploy-cloud-demo: | ||
| if: ${{ (github.ref == 'refs/heads/master') && github.event_name == 'push' }} | ||
| deploy-cloud: | ||
| if: ${{ ((github.ref == 'refs/heads/master') || | ||
| (github.ref == 'refs/heads/dev')) && | ||
| github.event_name == 'push' }} | ||
| needs: ci | ||
| uses: VirtoCommerce/.github/.github/workflows/[email protected].16 | ||
| uses: VirtoCommerce/.github/.github/workflows/[email protected].20 | ||
| with: | ||
| releaseSource: module | ||
| releaseType: GithubReleases | ||
| moduleId: ${{ needs.ci.outputs.moduleId }} | ||
| moduleVer: ${{ needs.ci.outputs.version }} | ||
| moduleBlob: ${{ needs.ci.outputs.blobId }} | ||
| jiraKeys: ${{ needs.ci.outputs.jira-keys }} | ||
| argoServer: 'argo.virtocommerce.cloud' | ||
| matrix: '{"include":[{"envName": "prod", "confPath": ".deployment/module/cloudDeploy.json"}]}' | ||
| secrets: | ||
| envPAT: ${{ secrets.REPO_TOKEN }} | ||
| argoLogin: ${{ secrets.ARGOCD_LOGIN }} | ||
| argoPassword: ${{ secrets.ARGOCD_PASSWORD }} | ||
| matrix: '{"include":${{ needs.ci.outputs.matrix }}}' | ||
| secrets: inherit | ||
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,4 +1,4 @@ | ||
| # v3.200.16 | ||
| # v3.200.20 | ||
| name: Release hotfix | ||
|
|
||
| on: | ||
|
|
@@ -12,12 +12,12 @@ on: | |
|
|
||
| jobs: | ||
| test: | ||
| uses: VirtoCommerce/.github/.github/workflows/[email protected].16 | ||
| uses: VirtoCommerce/.github/.github/workflows/[email protected].20 | ||
| secrets: | ||
| sonarToken: ${{ secrets.SONAR_TOKEN }} | ||
|
|
||
| build: | ||
| uses: VirtoCommerce/.github/.github/workflows/[email protected].16 | ||
| uses: VirtoCommerce/.github/.github/workflows/[email protected].20 | ||
| with: | ||
| uploadPackage: 'true' | ||
| uploadDocker: 'false' | ||
|
|
@@ -43,7 +43,7 @@ jobs: | |
| publish-github-release: | ||
| needs: | ||
| [build, test, get-metadata] | ||
| uses: VirtoCommerce/.github/.github/workflows/[email protected].16 | ||
| uses: VirtoCommerce/.github/.github/workflows/[email protected].20 | ||
| 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,4 +1,4 @@ | ||
| # v3.200.16 | ||
| # v3.200.20 | ||
| name: Publish nuget | ||
|
|
||
| on: | ||
|
|
@@ -12,12 +12,12 @@ on: | |
|
|
||
| jobs: | ||
| test: | ||
| uses: VirtoCommerce/.github/.github/workflows/[email protected].16 | ||
| uses: VirtoCommerce/.github/.github/workflows/[email protected].20 | ||
| secrets: | ||
| sonarToken: ${{ secrets.SONAR_TOKEN }} | ||
|
|
||
| build: | ||
| uses: VirtoCommerce/.github/.github/workflows/[email protected].16 | ||
| uses: VirtoCommerce/.github/.github/workflows/[email protected].20 | ||
| with: | ||
| uploadPackage: 'true' | ||
| uploadDocker: 'false' | ||
|
|
@@ -28,7 +28,7 @@ jobs: | |
| publish-nuget: | ||
| needs: | ||
| [build, test] | ||
| uses: VirtoCommerce/.github/.github/workflows/[email protected].16 | ||
| uses: VirtoCommerce/.github/.github/workflows/[email protected].20 | ||
| 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,11 +1,11 @@ | ||
| # v3.200.16 | ||
| # v3.200.20 | ||
| name: Release | ||
|
|
||
| on: | ||
| workflow_dispatch: | ||
|
|
||
| jobs: | ||
| release: | ||
| uses: VirtoCommerce/.github/.github/workflows/[email protected].16 | ||
| uses: VirtoCommerce/.github/.github/workflows/[email protected].20 | ||
| 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
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 |
|---|---|---|
|
|
@@ -45,5 +45,5 @@ public static TResult[] GetObjectsWithDerived<TResult>(this IEvent obj) | |
|
|
||
| return result.ToArray(); | ||
| } | ||
| } | ||
| } | ||
| } | ||
Oops, something went wrong.