From 01f312094a906b987f728f27e2b33f006869fe93 Mon Sep 17 00:00:00 2001 From: Rohith Rao Date: Fri, 10 May 2024 15:11:45 -0400 Subject: [PATCH] Override custom release to Appian docker registry --- .github/workflows/build.yml | 11 ++++++----- .releaserc.json | 8 +------- package.json | 2 +- tools/docker/Dockerfile | 2 +- tools/docker/bake.hcl | 2 +- tools/publish-release.ts | 4 ++-- 6 files changed, 12 insertions(+), 17 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3210e61d364e82..95deeedcc3a3b5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -4,6 +4,7 @@ on: push: branches: - main + - gitlab-forked-from-project pull_request: types: @@ -614,7 +615,7 @@ jobs: - codecov - coverage-threshold - if: github.repository == 'renovatebot/renovate' && github.event_name != 'pull_request' + # if: github.repository == 'renovatebot/renovate' && github.event_name != 'pull_request' runs-on: ubuntu-latest timeout-minutes: 60 permissions: @@ -646,7 +647,7 @@ jobs: - name: Docker registry login run: | - echo "${{ secrets.DOCKER_PASSWORD }}" | docker login -u ${{ secrets.DOCKER_USERNAME }} --password-stdin + # echo "${{ secrets.DOCKER_PASSWORD }}" | docker login -u ${{ secrets.DOCKER_USERNAME }} --password-stdin echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${{ github.repository_owner }} --password-stdin - name: Check dry run @@ -661,8 +662,8 @@ jobs: - name: semantic-release run: | - pnpm semantic-release --dry-run ${{env.DRY_RUN}} + pnpm semantic-release --dry-run false env: - GITHUB_TOKEN: ${{ secrets.GH_TOKEN }} # TODO: use action token? - NPM_TOKEN: ${{ secrets.NPM_TOKEN }} + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # TODO: use action token? + # NPM_TOKEN: ${{ secrets.NPM_TOKEN }} LOG_LEVEL: debug diff --git a/.releaserc.json b/.releaserc.json index a9dcb3f1bbf251..cc5e03df127996 100644 --- a/.releaserc.json +++ b/.releaserc.json @@ -1,7 +1,6 @@ { "plugins": [ "@semantic-release/commit-analyzer", - "@semantic-release/release-notes-generator", [ "@semantic-release/github", { @@ -14,7 +13,6 @@ ] } ], - "@semantic-release/npm", [ "@semantic-release/exec", { @@ -90,9 +88,5 @@ ] }, "tagFormat": "${version}", - "branches": [ - { - "name": "main" - } - ] + "branches": [{ "name": "main" }, { "name": "gitlab-forked-from-project" }] } diff --git a/package.json b/package.json index 2731f0430380c8..96e7b396ac3de6 100644 --- a/package.json +++ b/package.json @@ -61,7 +61,7 @@ }, "repository": { "type": "git", - "url": "https://github.com/renovatebot/renovate.git" + "url": "https://github.com/appian/renovate.git" }, "keywords": [ "automated", diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile index 391d79cb799e2d..47d2a30369af8d 100644 --- a/tools/docker/Dockerfile +++ b/tools/docker/Dockerfile @@ -79,4 +79,4 @@ LABEL \ org.label-schema.version="${RENOVATE_VERSION}" # Numeric user ID for the ubuntu user. Used to indicate a non-root user to OpenShift -USER 1000 +USER 1001 diff --git a/tools/docker/bake.hcl b/tools/docker/bake.hcl index 8a93f1924e94a4..46e507f0f2f99a 100644 --- a/tools/docker/bake.hcl +++ b/tools/docker/bake.hcl @@ -1,5 +1,5 @@ variable "OWNER" { - default = "renovatebot" + default = "appian" } variable "FILE" { default = "renovate" diff --git a/tools/publish-release.ts b/tools/publish-release.ts index 590ef44aab1625..6965958c1c9b2c 100644 --- a/tools/publish-release.ts +++ b/tools/publish-release.ts @@ -26,7 +26,7 @@ void (async () => { if (meta?.['push-slim']?.['containerimage.digest']) { sign( - `ghcr.io/renovatebot/renovate@${meta['push-slim']['containerimage.digest']}`, + `ghcr.io/appian/renovate@${meta['push-slim']['containerimage.digest']}`, opts, ); sign( @@ -39,7 +39,7 @@ void (async () => { if (meta?.['push-full']?.['containerimage.digest']) { sign( - `ghcr.io/renovatebot/renovate@${meta['push-full']['containerimage.digest']}`, + `ghcr.io/appian/renovate@${meta['push-full']['containerimage.digest']}`, opts, ); sign(