From 14e3c538ff9de4d79077a216fa8a8ddc88bdd4c0 Mon Sep 17 00:00:00 2001 From: tobi Date: Wed, 30 Oct 2024 16:36:24 +0000 Subject: [PATCH 1/2] Migrate Renovate setup to setup at Antville.org --- .github/workflows/deploy.yml | 9 +------- .github/workflows/renovate.yml | 42 ++++++++++++++++++++++++++++++++++ .github/workflows/stage.yml | 14 ++---------- .github/workflows/stale.yml | 8 +++---- .github/workflows/test.yml | 36 +++++++++++++++++++++++++++-- renovate.json | 1 + 6 files changed, 84 insertions(+), 26 deletions(-) create mode 100644 .github/workflows/renovate.yml diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index ffa0c8fc..453e8186 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -4,20 +4,13 @@ on: workflow_dispatch jobs: deploy: - runs-on: ubuntu-latest + runs-on: antville environment: name: p3k.org url: https://blog.p3k.org steps: - - name: Set up SSH agent - uses: antville/helma/.github/actions/ssh@helma-🐜 - with: - config: ${{ vars.SSH_CONFIG }} - key: ${{ secrets.SSH_PRIVATE_KEY }} - known-hosts: ${{ vars.SSH_KNOWN_HOSTS }} - - name: Copy files to production server run: ssh staging-server deploy-antville diff --git a/.github/workflows/renovate.yml b/.github/workflows/renovate.yml new file mode 100644 index 00000000..c895bb76 --- /dev/null +++ b/.github/workflows/renovate.yml @@ -0,0 +1,42 @@ +name: Run Renovate + +#on: workflow_dispatch + +on: + schedule: + - cron: "42 * * * *" + +jobs: + renovate: + runs-on: antville + + steps: + - uses: actions/checkout@v4 + + - name: Run Renovate + run: npx renovate + env: + # Renovate is using this token to retrieve release notes + GITHUB_COM_TOKEN: ${{ secrets.renovate_github_com_token }} + # See + LOG_LEVEL: info # debug | info | warn | error | fatal + RENOVATE_AUTODISCOVER: 'true' + RENOVATE_CONFIG_FILE: renovate.json + RENOVATE_ENDPOINT: ${{ github.api_url }} + RENOVATE_GIT_AUTHOR: Renovate Bot + #RENOVATE_GIT_IGNORED_AUTHORS: + # - 29139614+renovate[bot]@users.noreply.github.com + RENOVATE_IGNORE_PR_AUTHOR: 'true' + RENOVATE_LOG_FILE: renovate-log.ndjson + RENOVATE_LOG_FILE_LEVEL: debug + RENOVATE_PLATFORM: gitea + RENOVATE_REPOSITORY_CACHE: 'enabled' + # github.token is not working here, it lacks some permissions required by Renovate + RENOVATE_TOKEN: ${{ secrets.renovate_token }} #${{ github.token }} + + - name: Save log file + uses: actions/upload-artifact@v3 + with: + name: renovate-log.ndjson + path: renovate-log.ndjson + diff --git a/.github/workflows/stage.yml b/.github/workflows/stage.yml index afb04492..c53cc5e1 100644 --- a/.github/workflows/stage.yml +++ b/.github/workflows/stage.yml @@ -4,25 +4,15 @@ on: workflow_dispatch jobs: stage: - runs-on: ubuntu-latest + runs-on: antville environment: name: stage - url: https://antville-test.online + url: ${{ vars.stage_url }} steps: - uses: actions/checkout@v4 - - name: Set up SSH agent - uses: antville/helma/.github/actions/ssh@helma-🐜 - with: - config: ${{ vars.SSH_CONFIG }} - key: ${{ secrets.SSH_PRIVATE_KEY }} - known-hosts: ${{ vars.SSH_KNOWN_HOSTS }} - - - name: Set up Gradle - uses: gradle/actions/setup-gradle@v3 - - name: Build with Gradle run: ./gradlew :build diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml index f669afa6..d57ce590 100644 --- a/.github/workflows/stale.yml +++ b/.github/workflows/stale.yml @@ -1,21 +1,21 @@ name: Mark stale issues and pull requests -on: +on: schedule: - cron: "30 1 * * *" jobs: stale: - runs-on: ubuntu-latest + runs-on: antville permissions: issues: write pull-requests: write steps: - - uses: actions/stale@v9 + - uses: https://github.com/actions/stale@v9 with: - repo-token: ${{ secrets.GITHUB_TOKEN }} + repo-token: ${{ github.token }} stale-issue-message: 'Stale issue message' stale-pr-message: 'Stale pull request message' stale-issue-label: 'no-issue-activity' diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 12f9a407..d4efdf9d 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -4,7 +4,7 @@ on: workflow_dispatch jobs: test: - runs-on: host-runner + runs-on: debian environment: name: p3k.org @@ -15,4 +15,36 @@ jobs: run: | whoami pwd - find -maxdepth 1 / + ls -ahl ~ + echo $SHELL + + - name: Ping staging server + run: ssh staging-server ping + + - uses: actions/checkout@v4 + + - name: Run Renovate + run: npx renovate + env: + # TODO: + #GITHUB_COM_TOKEN= + # See + LOG_LEVEL: debug # debug | info | warn | error | fatal + #RENOVATE_CONFIG_FILE: ./.gitlab/renovate.json + RENOVATE_ENDPOINT: ${{ github.api_url }} + RENOVATE_GIT_AUTHOR: Renovate Bot + RENOVATE_LOG_FILE: renovate-log.ndjson + RENOVATE_LOG_FILE_LEVEL: debug + RENOVATE_PLATFORM: gitea + #RENOVATE_REPOSITORIES: $CI_PROJECT_PATH + RENOVATE_AUTODISCOVER: 'true' + RENOVATE_REPOSITORY_CACHE: 'enabled' + RENOVATE_TOKEN: ${{ vars.renovate_token }} #${{ github.token }} + + - uses: actions/upload-artifact@v3 + with: + name: Renovate log + path: renovate-log.ndjson + + #- name: Build with Gradle + # run: ./gradlew :build diff --git a/renovate.json b/renovate.json index 23abb3ef..edd7e28d 100644 --- a/renovate.json +++ b/renovate.json @@ -20,6 +20,7 @@ }, "labels": ["dependency"], + "gitIgnoredAuthors": ["29139614+renovate[bot]@users.noreply.github.com"], "packageRules": [ { From 101e82afc5b2f41efaf54b1431a0591c09c4f5cc Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Fri, 1 Nov 2024 15:43:24 +0000 Subject: [PATCH 2/2] Update CommonMark packages to v0.24.0 --- build.gradle | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index 5f115a8f..45960ef5 100644 --- a/build.gradle +++ b/build.gradle @@ -43,10 +43,10 @@ allprojects { version = distVersion() dependencies { - implementation 'org.commonmark:commonmark:0.21.0' - implementation 'org.commonmark:commonmark-ext-autolink:0.21.0' - implementation 'org.commonmark:commonmark-ext-gfm-strikethrough:0.21.0' - implementation 'org.commonmark:commonmark-ext-gfm-tables:0.21.0' + implementation 'org.commonmark:commonmark:0.24.0' + implementation 'org.commonmark:commonmark-ext-autolink:0.24.0' + implementation 'org.commonmark:commonmark-ext-gfm-strikethrough:0.24.0' + implementation 'org.commonmark:commonmark-ext-gfm-tables:0.24.0' implementation 'org.jsoup:jsoup:1.17.2' implementation 'rome:rome:1.0'