Skip to content

Commit

Permalink
Merge branch 'feat/VCST-2486' of https://github.com/VirtoCommerce/vc-…
Browse files Browse the repository at this point in the history
…module-core into feat/VCST-2486
  • Loading branch information
OlegoO committed Jan 31, 2025
2 parents f3b651e + 02da133 commit a4b251d
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 20 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/module-ci.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# v3.800.10
# https://virtocommerce.atlassian.net/browse/VCST-1738
# v3.800.11
# bump-ubuntu-version
name: Module CI

on:
Expand Down Expand Up @@ -33,7 +33,7 @@ jobs:
if: ${{ github.actor != 'dependabot[bot]' &&
(github.event.pull_request.head.repo.full_name == github.repository ||
github.event.pull_request.head.repo.full_name == '') }} # Check that PR not from forked repo and not from Dependabot
runs-on: ubuntu-20.04
runs-on: ubuntu-24.04
env:
CLOUD_INSTANCE_BASE_URL: ${{secrets.CLOUD_INSTANCE_BASE_URL}}
CLIENT_ID: ${{secrets.CLIENT_ID}}
Expand Down Expand Up @@ -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') || (github.base_ref == 'dev') && (github.event_name == 'pull_request') }}
needs: 'ci'
uses: VirtoCommerce/.github/.github/workflows/e2e.yml@v3.800.10
uses: VirtoCommerce/.github/.github/workflows/e2e.yml@v3.800.11

with:
katalonRepo: 'VirtoCommerce/vc-quality-gate-katalon'
Expand All @@ -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/deploy-cloud.yml@v3.800.10
uses: VirtoCommerce/.github/.github/workflows/deploy-cloud.yml@v3.800.11
with:
releaseSource: module
moduleId: ${{ needs.ci.outputs.moduleId }}
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/module-release-hotfix.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# v3.800.10
# https://virtocommerce.atlassian.net/browse/VCST-1738
# v3.800.11
# bump-ubuntu-version
name: Release hotfix

on:
Expand All @@ -13,12 +13,12 @@ on:

jobs:
test:
uses: VirtoCommerce/.github/.github/workflows/test-and-sonar.yml@v3.800.10
uses: VirtoCommerce/.github/.github/workflows/test-and-sonar.yml@v3.800.11
secrets:
sonarToken: ${{ secrets.SONAR_TOKEN }}

build:
uses: VirtoCommerce/.github/.github/workflows/build.yml@v3.800.10
uses: VirtoCommerce/.github/.github/workflows/build.yml@v3.800.11
with:
uploadPackage: 'true'
uploadDocker: 'false'
Expand All @@ -28,7 +28,7 @@ jobs:
envPAT: ${{ secrets.REPO_TOKEN }}

get-metadata:
runs-on: ubuntu-20.04
runs-on: ubuntu-24.04
env:
GITHUB_TOKEN: ${{ secrets.REPO_TOKEN }}
outputs:
Expand All @@ -46,7 +46,7 @@ jobs:
publish-github-release:
needs:
[build, test, get-metadata]
uses: VirtoCommerce/.github/.github/workflows/publish-github.yml@v3.800.10
uses: VirtoCommerce/.github/.github/workflows/publish-github.yml@v3.800.11
with:
fullKey: ${{ needs.build.outputs.packageFullKey }}
changeLog: '${{ needs.get-metadata.outputs.changeLog }}'
Expand All @@ -61,7 +61,7 @@ jobs:
needs:
[publish-github-release]
if: ${{ github.event.inputs.incrementPatch == 'true' }}
runs-on: ubuntu-20.04
runs-on: ubuntu-24.04
steps:
- name: Checkout
uses: actions/checkout@v4
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/publish-nugets.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# v3.800.10
# https://virtocommerce.atlassian.net/browse/VCST-1738
# v3.800.11
# bump-ubuntu-version
name: Publish nuget

on:
Expand All @@ -13,12 +13,12 @@ on:

jobs:
test:
uses: VirtoCommerce/.github/.github/workflows/test-and-sonar.yml@v3.800.10
uses: VirtoCommerce/.github/.github/workflows/test-and-sonar.yml@v3.800.11
secrets:
sonarToken: ${{ secrets.SONAR_TOKEN }}

build:
uses: VirtoCommerce/.github/.github/workflows/build.yml@v3.800.10
uses: VirtoCommerce/.github/.github/workflows/build.yml@v3.800.11
with:
uploadPackage: 'true'
uploadDocker: 'false'
Expand All @@ -29,7 +29,7 @@ jobs:
publish-nuget:
needs:
[build, test]
uses: VirtoCommerce/.github/.github/workflows/publish-github.yml@v3.800.10
uses: VirtoCommerce/.github/.github/workflows/publish-github.yml@v3.800.11
with:
fullKey: ${{ needs.build.outputs.packageFullKey }}
forceGithub: false
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
# v3.800.10
# https://virtocommerce.atlassian.net/browse/VCST-1738
# v3.800.11
# bump-ubuntu-version
name: Release

on:
workflow_dispatch:

jobs:
release:
uses: VirtoCommerce/.github/.github/workflows/release.yml@v3.800.10
uses: VirtoCommerce/.github/.github/workflows/release.yml@v3.800.11
secrets:
envPAT: ${{ secrets.REPO_TOKEN }}

0 comments on commit a4b251d

Please sign in to comment.