diff --git a/.forgejo/workflows/renovate.yaml b/.forgejo/workflows/renovate.yaml index b3b240f..ae21d7b 100644 --- a/.forgejo/workflows/renovate.yaml +++ b/.forgejo/workflows/renovate.yaml @@ -39,6 +39,7 @@ jobs: RENOVATE_PLATFORM: gitea RENOVATE_ENDPOINT: ${{ github.server_url }} RENOVATE_TOKEN: ${{ github.repository == 'jahanson/renovate-config' && secrets.TOKEN || secrets.GITHUB_TOKEN }} + GITHUB_COM_TOKEN: ${{ secrets.GH_TOKEN }} # Git config RENOVATE_GIT_AUTHOR: 'Renovate Bot ' @@ -47,38 +48,19 @@ jobs: GIT_COMMITTER_NAME: 'Renovate Bot' GIT_COMMITTER_EMAIL: 'smeagol@hsn.dev' - # Authentication - GITHUB_COM_TOKEN: ${{ secrets.GH_TOKEN }} - DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }} - DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }} + # Authentication using host rules format + GITHUB_GITHUB_COM_TOKEN: ${{ secrets.GH_TOKEN }} + DOCKER_DOCKER_IO_USERNAME: ${{ secrets.DOCKER_USERNAME }} + DOCKER_DOCKER_IO_PASSWORD: ${{ secrets.DOCKER_PASSWORD }} + DOCKER_GHCR_IO_USERNAME: ${{ secrets.GH_USERNAME }} + DOCKER_GHCR_IO_PASSWORD: ${{ secrets.GH_TOKEN }} + GITEA_GIT_HSN_DEV_TOKEN: ${{ secrets.MIRROR_TOKEN }} # Logging LOG_LEVEL: debug LOG_FORMAT: json LOG_FILE_LEVEL: debug - # Host rules for registry authentication - RENOVATE_HOST_RULES: |- - [ - { - "matchHost": "registry-1.docker.io", - "hostType": "docker", - "username": "${{ secrets.DOCKER_USERNAME }}", - "password": "${{ secrets.DOCKER_PASSWORD }}" - }, - { - "matchHost": "ghcr.io", - "hostType": "docker", - "username": "${{ secrets.GH_USERNAME }}", - "password": "${{ secrets.GH_TOKEN }}" - }, - { - "matchHost": "git.hsn.dev", - "hostType": "gitea", - "token": "${{ secrets.MIRROR_TOKEN }}" - } - ] - # Command execution INPUT_ARGS: ${{ inputs.args || (github.repository != 'jahanson/renovate-config' && github.repository) || '--autodiscover' }} run: renovate ${{ env.INPUT_ARGS }}