From 0e508be8511031f50fc159ffefd4876bd1aac7ed Mon Sep 17 00:00:00 2001 From: PioBar Date: Wed, 25 Mar 2026 13:29:30 +0100 Subject: [PATCH 1/2] consume packages from artifactory --- .github/workflows/cache-node-modules.yml | 1 + .github/workflows/ci-continuous-integration.yml | 1 + .github/workflows/config-check.yml | 3 +++ .github/workflows/install.yml | 4 ++++ .github/workflows/lighthouse.yml | 1 + .github/workflows/minor-release.yml | 4 ++++ .github/workflows/update-ccv2.yml | 1 + .npmrc | 3 +++ renovate.json | 1 + 9 files changed, 19 insertions(+) create mode 100644 .npmrc diff --git a/.github/workflows/cache-node-modules.yml b/.github/workflows/cache-node-modules.yml index 554885ef4e6..8dbde1962be 100644 --- a/.github/workflows/cache-node-modules.yml +++ b/.github/workflows/cache-node-modules.yml @@ -13,6 +13,7 @@ name: Cache node modules env: NODE_VERSION: '20' CONTINUUM_REGISTRY_TOKEN: ${{ secrets.CONTINUUM_REGISTRY_TOKEN }} + COMMON_SAP_ARTIFACTORY_TOKEN: ${{ secrets.COMMON_SAP_ARTIFACTORY_TOKEN }} jobs: cacheNodeModules: diff --git a/.github/workflows/ci-continuous-integration.yml b/.github/workflows/ci-continuous-integration.yml index 808faf1ea2d..439e4cef399 100644 --- a/.github/workflows/ci-continuous-integration.yml +++ b/.github/workflows/ci-continuous-integration.yml @@ -16,6 +16,7 @@ env: NODE_VERSION: '20' NX_BASE: origin/${{ github.event.pull_request.base.ref }} NX_HEAD: origin/${{ github.event.pull_request.head.ref }} + COMMON_SAP_ARTIFACTORY_TOKEN: ${{ secrets.COMMON_SAP_ARTIFACTORY_TOKEN }} concurrency: group: ci-continuous-integration-${{ github.head_ref || github.run_id }} diff --git a/.github/workflows/config-check.yml b/.github/workflows/config-check.yml index 785f507a865..ae23af7530d 100644 --- a/.github/workflows/config-check.yml +++ b/.github/workflows/config-check.yml @@ -6,6 +6,9 @@ on: - '**.md' - 'docs/**' +env: + COMMON_SAP_ARTIFACTORY_TOKEN: ${{ secrets.COMMON_SAP_ARTIFACTORY_TOKEN }} + name: Config check jobs: configCheck: diff --git a/.github/workflows/install.yml b/.github/workflows/install.yml index 85caf797956..319a5f0fca0 100644 --- a/.github/workflows/install.yml +++ b/.github/workflows/install.yml @@ -11,6 +11,10 @@ on: - 'docs/**' name: Installation + +env: + COMMON_SAP_ARTIFACTORY_TOKEN: ${{ secrets.COMMON_SAP_ARTIFACTORY_TOKEN }} + jobs: install: name: Build libs and install diff --git a/.github/workflows/lighthouse.yml b/.github/workflows/lighthouse.yml index 367d04ac8bd..b97b382b445 100644 --- a/.github/workflows/lighthouse.yml +++ b/.github/workflows/lighthouse.yml @@ -15,6 +15,7 @@ on: env: CYPRESS_KEY: ${{ secrets.CYPRESS_KEY }} NODE_VERSION: '20' + COMMON_SAP_ARTIFACTORY_TOKEN: ${{ secrets.COMMON_SAP_ARTIFACTORY_TOKEN }} concurrency: group: lighthouse-${{ github.head_ref || github.run_id }} diff --git a/.github/workflows/minor-release.yml b/.github/workflows/minor-release.yml index d3babae3c53..313e8a09e2e 100644 --- a/.github/workflows/minor-release.yml +++ b/.github/workflows/minor-release.yml @@ -14,6 +14,10 @@ on: required: false type: 'boolean' default: false + +env: + COMMON_SAP_ARTIFACTORY_TOKEN: ${{ secrets.COMMON_SAP_ARTIFACTORY_TOKEN }} + jobs: release: runs-on: ubuntu-latest diff --git a/.github/workflows/update-ccv2.yml b/.github/workflows/update-ccv2.yml index 928eb0bd85b..0e6be48f381 100644 --- a/.github/workflows/update-ccv2.yml +++ b/.github/workflows/update-ccv2.yml @@ -12,6 +12,7 @@ name: Update ccv2 repo with unreleased Spartacus env: DEFAULT_BRANCH_TO_DEPLOY: ${{ github.event.repository.default_branch }} + COMMON_SAP_ARTIFACTORY_TOKEN: ${{ secrets.COMMON_SAP_ARTIFACTORY_TOKEN }} jobs: deploy_to_ccv2: diff --git a/.npmrc b/.npmrc new file mode 100644 index 00000000000..bd3fd171a32 --- /dev/null +++ b/.npmrc @@ -0,0 +1,3 @@ +always-auth=true +registry=https://common.repositories.cloud.sap/artifactory/api/npm/npmjs/ +//common.repositories.cloud.sap/artifactory/api/npm/npmjs/:_authToken=${COMMON_SAP_ARTIFACTORY_TOKEN} \ No newline at end of file diff --git a/renovate.json b/renovate.json index 77ea55f4288..74c3fa2e8c9 100644 --- a/renovate.json +++ b/renovate.json @@ -34,6 +34,7 @@ "addLabels": ["update-patch"] } ], + "minimumReleaseAge": "3 days", "prCreation": "immediate", "rebaseWhen": "never", "branchConcurrentLimit": 7, From fb708b0f994119403418e60ef90cb6d51c5b1e0c Mon Sep 17 00:00:00 2001 From: PioBar Date: Wed, 25 Mar 2026 13:46:02 +0100 Subject: [PATCH 2/2] rename var --- .github/workflows/cache-node-modules.yml | 2 +- .github/workflows/ci-continuous-integration.yml | 2 +- .github/workflows/ci-merge-checks.yml | 1 + .github/workflows/ci.yml | 1 + .github/workflows/config-check.yml | 2 +- .github/workflows/install.yml | 2 +- .github/workflows/lighthouse.yml | 2 +- .github/workflows/minor-release.yml | 2 +- .github/workflows/update-ccv2.yml | 2 +- .npmrc | 2 +- 10 files changed, 10 insertions(+), 8 deletions(-) diff --git a/.github/workflows/cache-node-modules.yml b/.github/workflows/cache-node-modules.yml index 8dbde1962be..e51199060a7 100644 --- a/.github/workflows/cache-node-modules.yml +++ b/.github/workflows/cache-node-modules.yml @@ -13,7 +13,7 @@ name: Cache node modules env: NODE_VERSION: '20' CONTINUUM_REGISTRY_TOKEN: ${{ secrets.CONTINUUM_REGISTRY_TOKEN }} - COMMON_SAP_ARTIFACTORY_TOKEN: ${{ secrets.COMMON_SAP_ARTIFACTORY_TOKEN }} + SAP_ARTIFACTORY_NPM_TOKEN: ${{ secrets.SAP_ARTIFACTORY_NPM_TOKEN }} jobs: cacheNodeModules: diff --git a/.github/workflows/ci-continuous-integration.yml b/.github/workflows/ci-continuous-integration.yml index 439e4cef399..6e6709cfb48 100644 --- a/.github/workflows/ci-continuous-integration.yml +++ b/.github/workflows/ci-continuous-integration.yml @@ -16,7 +16,7 @@ env: NODE_VERSION: '20' NX_BASE: origin/${{ github.event.pull_request.base.ref }} NX_HEAD: origin/${{ github.event.pull_request.head.ref }} - COMMON_SAP_ARTIFACTORY_TOKEN: ${{ secrets.COMMON_SAP_ARTIFACTORY_TOKEN }} + SAP_ARTIFACTORY_NPM_TOKEN: ${{ secrets.SAP_ARTIFACTORY_NPM_TOKEN }} concurrency: group: ci-continuous-integration-${{ github.head_ref || github.run_id }} diff --git a/.github/workflows/ci-merge-checks.yml b/.github/workflows/ci-merge-checks.yml index eeb7c9a55cd..43a122b6919 100644 --- a/.github/workflows/ci-merge-checks.yml +++ b/.github/workflows/ci-merge-checks.yml @@ -18,6 +18,7 @@ env: NODE_VERSION: '20' CONTINUUM_REGISTRY_TOKEN: ${{ secrets.CONTINUUM_REGISTRY_TOKEN }} COMMON_SAP_ARTIFACTORY_TOKEN: ${{ secrets.COMMON_SAP_ARTIFACTORY_TOKEN }} + SAP_ARTIFACTORY_NPM_TOKEN: ${{ secrets.SAP_ARTIFACTORY_NPM_TOKEN }} concurrency: group: ci-merge-checks-${{ github.head_ref || github.run_id }} diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b75a311cd86..716ff86a9be 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,6 +16,7 @@ env: NODE_VERSION: "20" CONTINUUM_REGISTRY_TOKEN: ${{ secrets.CONTINUUM_REGISTRY_TOKEN }} COMMON_SAP_ARTIFACTORY_TOKEN: ${{ secrets.COMMON_SAP_ARTIFACTORY_TOKEN }} + SAP_ARTIFACTORY_NPM_TOKEN: ${{ secrets.SAP_ARTIFACTORY_NPM_TOKEN }} concurrency: group: ci-${{ github.head_ref || github.run_id }} diff --git a/.github/workflows/config-check.yml b/.github/workflows/config-check.yml index ae23af7530d..acb7daf9a27 100644 --- a/.github/workflows/config-check.yml +++ b/.github/workflows/config-check.yml @@ -7,7 +7,7 @@ on: - 'docs/**' env: - COMMON_SAP_ARTIFACTORY_TOKEN: ${{ secrets.COMMON_SAP_ARTIFACTORY_TOKEN }} + SAP_ARTIFACTORY_NPM_TOKEN: ${{ secrets.SAP_ARTIFACTORY_NPM_TOKEN }} name: Config check jobs: diff --git a/.github/workflows/install.yml b/.github/workflows/install.yml index 319a5f0fca0..1f510e1f3e5 100644 --- a/.github/workflows/install.yml +++ b/.github/workflows/install.yml @@ -13,7 +13,7 @@ on: name: Installation env: - COMMON_SAP_ARTIFACTORY_TOKEN: ${{ secrets.COMMON_SAP_ARTIFACTORY_TOKEN }} + SAP_ARTIFACTORY_NPM_TOKEN: ${{ secrets.SAP_ARTIFACTORY_NPM_TOKEN }} jobs: install: diff --git a/.github/workflows/lighthouse.yml b/.github/workflows/lighthouse.yml index b97b382b445..6f050a6cb96 100644 --- a/.github/workflows/lighthouse.yml +++ b/.github/workflows/lighthouse.yml @@ -15,7 +15,7 @@ on: env: CYPRESS_KEY: ${{ secrets.CYPRESS_KEY }} NODE_VERSION: '20' - COMMON_SAP_ARTIFACTORY_TOKEN: ${{ secrets.COMMON_SAP_ARTIFACTORY_TOKEN }} + SAP_ARTIFACTORY_NPM_TOKEN: ${{ secrets.SAP_ARTIFACTORY_NPM_TOKEN }} concurrency: group: lighthouse-${{ github.head_ref || github.run_id }} diff --git a/.github/workflows/minor-release.yml b/.github/workflows/minor-release.yml index 313e8a09e2e..28d73a342ce 100644 --- a/.github/workflows/minor-release.yml +++ b/.github/workflows/minor-release.yml @@ -16,7 +16,7 @@ on: default: false env: - COMMON_SAP_ARTIFACTORY_TOKEN: ${{ secrets.COMMON_SAP_ARTIFACTORY_TOKEN }} + SAP_ARTIFACTORY_NPM_TOKEN: ${{ secrets.SAP_ARTIFACTORY_NPM_TOKEN }} jobs: release: diff --git a/.github/workflows/update-ccv2.yml b/.github/workflows/update-ccv2.yml index 0e6be48f381..3d6e0879910 100644 --- a/.github/workflows/update-ccv2.yml +++ b/.github/workflows/update-ccv2.yml @@ -12,7 +12,7 @@ name: Update ccv2 repo with unreleased Spartacus env: DEFAULT_BRANCH_TO_DEPLOY: ${{ github.event.repository.default_branch }} - COMMON_SAP_ARTIFACTORY_TOKEN: ${{ secrets.COMMON_SAP_ARTIFACTORY_TOKEN }} + SAP_ARTIFACTORY_NPM_TOKEN: ${{ secrets.SAP_ARTIFACTORY_NPM_TOKEN }} jobs: deploy_to_ccv2: diff --git a/.npmrc b/.npmrc index bd3fd171a32..8bcc0d63b8b 100644 --- a/.npmrc +++ b/.npmrc @@ -1,3 +1,3 @@ always-auth=true registry=https://common.repositories.cloud.sap/artifactory/api/npm/npmjs/ -//common.repositories.cloud.sap/artifactory/api/npm/npmjs/:_authToken=${COMMON_SAP_ARTIFACTORY_TOKEN} \ No newline at end of file +//common.repositories.cloud.sap/artifactory/api/npm/npmjs/:_authToken=${SAP_ARTIFACTORY_NPM_TOKEN} \ No newline at end of file