From 30e812d06dc144950f8cba8aa52db414b13446c0 Mon Sep 17 00:00:00 2001 From: Basil Kotov Date: Wed, 21 Feb 2024 09:59:21 +0000 Subject: [PATCH] fix workflow --- .github/CODEOWNERS | 9 ------ .github/workflows/module-ci.yml | 31 ++++++------------- .github/workflows/module-release-hotfix.yml | 13 ++++---- .github/workflows/publish-nugets.yml | 9 +++--- .github/workflows/release.yml | 5 +-- Directory.Build.props | 2 +- src/VirtoCommerce.Skyflow.Web/module.manifest | 2 +- 7 files changed, 27 insertions(+), 44 deletions(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index f9421a3..7302543 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1,9 +1,3 @@ -# Common settings - -.github/* @mvktsk @Vectorfield4 -.gitignore @mvktsk @Vectorfield4 -.dockerignore @mvktsk @Vectorfield4 - # Main Code and Tests src/* @VirtoCommerce/platform @@ -11,6 +5,3 @@ tests/* @VirtoCommerce/platform .editorconfig @VirtoCommerce/platform 3rd-party-components.md @VirtoCommerce/platform VirtoCommerce.Platform.sln @VirtoCommerce/platform - -# Docs -docs/* @zashchitnik-kuka diff --git a/.github/workflows/module-ci.yml b/.github/workflows/module-ci.yml index ed4a148..3a9a9f6 100644 --- a/.github/workflows/module-ci.yml +++ b/.github/workflows/module-ci.yml @@ -1,4 +1,5 @@ -# v3.200.35 +# v3.800.2 +# https://virtocommerce.atlassian.net/browse/VCST-349 name: Module CI on: @@ -56,13 +57,13 @@ jobs: steps: - - name: Set up Node 18 - uses: actions/setup-node@v3 + - name: Set up Node 20 + uses: actions/setup-node@v4 with: - node-version: '18' + node-version: '20' - name: Set up Java 17 - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: 'temurin' java-version: '17' @@ -72,7 +73,7 @@ jobs: run: | echo "RELEASE_STATUS=true" >> $GITHUB_ENV - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: 0 @@ -127,7 +128,7 @@ jobs: run: vc-build Compress -skip Clean+Restore+Compile+Test - name: Publish Nuget - if: ${{ (github.ref == 'refs/heads/dev' || github.ref == 'refs/heads/master') && github.event_name != 'workflow_dispatch' }} + if: ${{ github.ref == 'refs/heads/master' && github.event_name != 'workflow_dispatch' }} uses: VirtoCommerce/vc-github-actions/publish-nuget@master - name: Publish to Blob @@ -202,18 +203,6 @@ jobs: with: packageUrl: ${{ steps.artifactUrl.outputs.download_url }} - - name: Update virtocommerce.com - if: ${{ github.ref == 'refs/heads/master' }} - uses: VirtoCommerce/vc-github-actions/update-virtocommercecom@master - with: - githubToken: ${{ secrets.REPO_TOKEN }} - login: ${{ secrets.VIRTOCOMMERCE_APP_ID }} - password: ${{ secrets.VIRTOCOMMERCE_SECRET }} - moduleId: ${{ steps.artifact_ver.outputs.moduleId }} - moduleDescription: ${{ steps.artifact_ver.outputs.moduleDescription }} - projectUrl: ${{ steps.artifact_ver.outputs.projectUrl }} - iconUrl: ${{ steps.artifact_ver.outputs.iconUrl }} - - name: Parse Jira Keys from All Commits uses: VirtoCommerce/vc-github-actions/get-jira-keys@master if: always() @@ -252,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.200.35 + uses: VirtoCommerce/.github/.github/workflows/e2e.yml@v3.800.2 with: katalonRepo: 'VirtoCommerce/vc-quality-gate-katalon' katalonRepoBranch: 'dev' @@ -272,7 +261,7 @@ jobs: (github.ref == 'refs/heads/dev')) && github.event_name == 'push' }} needs: ci - uses: VirtoCommerce/.github/.github/workflows/deploy-cloud.yml@v3.200.35 + uses: VirtoCommerce/.github/.github/workflows/deploy-cloud.yml@v3.800.2 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 3083eea..519c5a8 100644 --- a/.github/workflows/module-release-hotfix.yml +++ b/.github/workflows/module-release-hotfix.yml @@ -1,4 +1,5 @@ -# v3.200.35 +# v3.800.2 +# https://virtocommerce.atlassian.net/browse/VCST-349 name: Release hotfix on: @@ -12,12 +13,12 @@ on: jobs: test: - uses: VirtoCommerce/.github/.github/workflows/test-and-sonar.yml@v3.200.35 + uses: VirtoCommerce/.github/.github/workflows/test-and-sonar.yml@v3.800.2 secrets: sonarToken: ${{ secrets.SONAR_TOKEN }} build: - uses: VirtoCommerce/.github/.github/workflows/build.yml@v3.200.35 + uses: VirtoCommerce/.github/.github/workflows/build.yml@v3.800.2 with: uploadPackage: 'true' uploadDocker: 'false' @@ -34,7 +35,7 @@ jobs: changelog: ${{ steps.changelog.outputs.changelog }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: 0 @@ -45,7 +46,7 @@ jobs: publish-github-release: needs: [build, test, get-metadata] - uses: VirtoCommerce/.github/.github/workflows/publish-github.yml@v3.200.35 + uses: VirtoCommerce/.github/.github/workflows/publish-github.yml@v3.800.2 with: fullKey: ${{ needs.build.outputs.packageFullKey }} changeLog: '${{ needs.get-metadata.outputs.changeLog }}' @@ -62,7 +63,7 @@ jobs: runs-on: ubuntu-20.04 steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Install VirtoCommerce.GlobalTool uses: VirtoCommerce/vc-github-actions/setup-vcbuild@master diff --git a/.github/workflows/publish-nugets.yml b/.github/workflows/publish-nugets.yml index 67fb8da..f92e2d6 100644 --- a/.github/workflows/publish-nugets.yml +++ b/.github/workflows/publish-nugets.yml @@ -1,4 +1,5 @@ -# v3.200.35 +# v3.800.2 +# https://virtocommerce.atlassian.net/browse/VCST-349 name: Publish nuget on: @@ -12,12 +13,12 @@ on: jobs: test: - uses: VirtoCommerce/.github/.github/workflows/test-and-sonar.yml@v3.200.35 + uses: VirtoCommerce/.github/.github/workflows/test-and-sonar.yml@v3.800.2 secrets: sonarToken: ${{ secrets.SONAR_TOKEN }} build: - uses: VirtoCommerce/.github/.github/workflows/build.yml@v3.200.35 + uses: VirtoCommerce/.github/.github/workflows/build.yml@v3.800.2 with: uploadPackage: 'true' uploadDocker: 'false' @@ -28,7 +29,7 @@ jobs: publish-nuget: needs: [build, test] - uses: VirtoCommerce/.github/.github/workflows/publish-github.yml@v3.200.35 + uses: VirtoCommerce/.github/.github/workflows/publish-github.yml@v3.800.2 with: fullKey: ${{ needs.build.outputs.packageFullKey }} forceGithub: false diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 2b47517..034cf00 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,4 +1,5 @@ -# v3.200.35 +# v3.800.2 +# https://virtocommerce.atlassian.net/browse/VCST-349 name: Release on: @@ -6,6 +7,6 @@ on: jobs: release: - uses: VirtoCommerce/.github/.github/workflows/release.yml@v3.200.35 + uses: VirtoCommerce/.github/.github/workflows/release.yml@v3.800.2 secrets: envPAT: ${{ secrets.REPO_TOKEN }} \ No newline at end of file diff --git a/Directory.Build.props b/Directory.Build.props index 6278851..4834e4f 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -2,7 +2,7 @@ - 3.801.0 + 3.800.0 $(VersionSuffix)-$(BuildNumber) diff --git a/src/VirtoCommerce.Skyflow.Web/module.manifest b/src/VirtoCommerce.Skyflow.Web/module.manifest index 20853cb..f789128 100644 --- a/src/VirtoCommerce.Skyflow.Web/module.manifest +++ b/src/VirtoCommerce.Skyflow.Web/module.manifest @@ -1,7 +1,7 @@ VirtoCommerce.Skyflow - 3.801.0 + 3.800.0 3.800.0