From 7346e0edb5b0524a3bbdd1fa4d1b21ef99419ad2 Mon Sep 17 00:00:00 2001 From: Ivan Polomani Date: Thu, 3 Oct 2024 15:48:53 +0200 Subject: [PATCH 1/2] Fix renovate.json repo became public, we need to extend a different base renovate config --- .github/renovate.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/renovate.json b/.github/renovate.json index 008e503..d560c24 100644 --- a/.github/renovate.json +++ b/.github/renovate.json @@ -1,7 +1,7 @@ { "$schema": "https://docs.renovatebot.com/renovate-schema.json", "extends": [ - "local>cognitedata/renovate-config", + "local>cognitedata/renovate-config-public", ":automergeMinor" ] } From 4c0fb2bde07c8842e9d7c8e6f9b981093040a097 Mon Sep 17 00:00:00 2001 From: Ivan Polomani Date: Fri, 4 Oct 2024 09:41:16 +0200 Subject: [PATCH 2/2] fix artifactory secrets ref (will fail in CI) --- .github/workflows/build-installer.yml | 5 ++++- .github/workflows/common.yml | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-installer.yml b/.github/workflows/build-installer.yml index 7f31945..69db334 100644 --- a/.github/workflows/build-installer.yml +++ b/.github/workflows/build-installer.yml @@ -77,8 +77,11 @@ jobs: asset_content_type: application/octet-stream - name: Install publisher + env: + PYPI_ARTIFACTORY_USERNAME: ${{ secrets.ARTIFACTORY_READONLY_TOKEN_USER_PUBLIC_REPOS }} + PYPI_ARTIFACTORY_PASSWORD: ${{ secrets.ARTIFACTORY_READONLY_TOKEN_PUBLIC_REPOS }} shell: bash - run: pip install cognite-extractor-publisher --extra-index-url "https://${{ secrets.ARTIFACTORY_READONLY_TOKEN_USER }}:${{ secrets.ARTIFACTORY_READONLY_TOKEN }}@cognite.jfrog.io/cognite/api/pypi/snakepit/simple" + run: pip install cognite-extractor-publisher --extra-index-url "https://${PYPI_ARTIFACTORY_USERNAME}:${PYPI_ARTIFACTORY_PASSWORD}@cognite.jfrog.io/cognite/api/pypi/snakepit/simple" - name: publish connector env: diff --git a/.github/workflows/common.yml b/.github/workflows/common.yml index 05aa3fd..51863ec 100644 --- a/.github/workflows/common.yml +++ b/.github/workflows/common.yml @@ -13,9 +13,9 @@ on: description: Branch value: ${{ jobs.prerequisites.outputs.branch }} secrets: - ARTIFACTORY_READONLY_TOKEN: + ARTIFACTORY_READONLY_TOKEN_USER_PUBLIC_REPOS: required: true - ARTIFACTORY_READONLY_TOKEN_USER: + ARTIFACTORY_READONLY_TOKEN_PUBLIC_REPOS: required: true jobs: