Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
charphi committed Sep 6, 2024
2 parents f4e4240 + 2e18713 commit 9bc1428
Show file tree
Hide file tree
Showing 233 changed files with 6,242 additions and 2,186 deletions.
40 changes: 40 additions & 0 deletions .github/workflows/check-links.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
name: Check links in documentation

on:
push:
paths:
- '.github/workflows/check-links.yml'
- 'lychee.toml'
- '**/*.md'
schedule:
# Run on the first of each month at 9:00 AM
- cron: "0 9 1 * *"
workflow_dispatch:

concurrency:
group: "${{ github.workflow }}-${{ github.head_ref }}"
cancel-in-progress: true

jobs:
lychee:
runs-on: ubuntu-latest
steps:
- name: Checkout source code
uses: actions/checkout@v4
with:
submodules: true
fetch-depth: 0

- name: Restore lychee cache
uses: actions/cache@v4
with:
path: .lycheecache
key: cache-lychee-${{ github.sha }}
restore-keys: cache-lychee-

- name: Check links
id: lychee
uses: lycheeverse/[email protected]
with:
fail: true
args: --max-concurrency 1 --cache --no-progress --exclude-all-private './**/*.md'
6 changes: 3 additions & 3 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v2
uses: github/codeql-action/init@v3
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
Expand All @@ -50,7 +50,7 @@ jobs:
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@v2
uses: github/codeql-action/autobuild@v3

# ℹ️ Command-line programs to run using the OS shell.
# 📚 https://git.io/JvXDl
Expand All @@ -64,4 +64,4 @@ jobs:
# make release

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
uses: github/codeql-action/analyze@v3
25 changes: 19 additions & 6 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,20 @@ name: Documentation deployment
on: [ push ]

jobs:
check:
name: Check resources
runs-on: ubuntu-latest

steps:
- name: Check jbang-action
uses: jbangdev/[email protected]
with:
trust: https://github.com/nbbrd/jbang-catalog/
script: heylogs@nbbrd
scriptargs: "--version"

deploy:
needs: check
if: startsWith(github.repository, 'nbbrd/') && ((github.ref == 'refs/heads/develop') || startsWith(github.ref, 'refs/tags/v'))
name: Deploy to GitHub Pages
runs-on: ubuntu-latest
Expand All @@ -20,7 +33,7 @@ jobs:
fetch-depth: 0

- name: Setup Java
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: 17
Expand All @@ -30,7 +43,7 @@ jobs:
run: mvn -B -ntp install -DskipTests -P setup-docs

- name: Setup Hugo
uses: peaceiris/actions-hugo@v2
uses: peaceiris/actions-hugo@v3
with:
hugo-version: 'latest'

Expand All @@ -40,7 +53,7 @@ jobs:
touch ./docs/public/.nojekyll
- name: Deploy pages
uses: peaceiris/actions-gh-pages@v3
uses: peaceiris/actions-gh-pages@v4
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
publish_dir: ./docs/public
Expand All @@ -60,15 +73,15 @@ jobs:
with:
ref: 'gh-pages'

- uses: actions/cache@v3
- uses: actions/cache@v4
with:
path: /root/.jbang
key: $-jbang-$
restore-keys: |
$-jbang-
- name: Create index.html
uses: jbangdev/jbang-action@main
uses: jbangdev/jbang-action@v0.117.1
with:
trust: https://gist.github.com/charphi/
script: https://gist.github.com/charphi/f44a24eb35dbd61b9f1d7759f0e561bd
Expand All @@ -77,7 +90,7 @@ jobs:
JBANG_REPO: /root/.jbang/repository

- name: Deploy index.html
uses: peaceiris/actions-gh-pages@v3
uses: peaceiris/actions-gh-pages@v4
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
destination_dir: ./docs
Expand Down
33 changes: 33 additions & 0 deletions .github/workflows/heylogs.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
name: Heylogs

on: [ push ]

jobs:
badge-job:
if: startsWith(github.repository, 'nbbrd/') && startsWith(github.ref, 'refs/heads/develop')
runs-on: ubuntu-latest
steps:
- name: Checkout source code
uses: actions/checkout@v4

- name: Setup Java
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: 21
cache: 'maven'

- name: Scan changelog
run: mvn -B -ntp -U com.github.nbbrd.heylogs:heylogs-maven-plugin::scan -Dheylogs.output.file=scan.json -Dheylogs.format.id=json

- name: Create badges endpoint json
run: |
mkdir heylogs
jq '{schemaVersion: 1, label: "unreleased changes", message: "#\(.[0].summary.unreleasedChanges)", color: "E05735", logoColor: "white", namedLogo: "keepachangelog"}' scan.json > heylogs/unreleased-changes.json
- name: Deploy badges endpoint json
uses: peaceiris/actions-gh-pages@v4
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
publish_branch: badges
publish_dir: ./heylogs
4 changes: 2 additions & 2 deletions .github/workflows/hugo-geekdoc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
fetch-depth: 0

- name: Setup Java
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: 17
Expand All @@ -43,7 +43,7 @@ jobs:
- name: Create Pull Request
id: cpr
uses: peter-evans/create-pull-request@v5
uses: peter-evans/create-pull-request@v7
with:
commit-message: Bump ${{ env.DEP_PROP }} to ${{ steps.lr.outputs.release }}
title: Bump ${{ env.DEP_PROP }} to ${{ steps.lr.outputs.release }}
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/java-ea-maven.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ jobs:
strategy:
fail-fast: false
matrix:
java: [ 20 ]
os: [ ubuntu-latest ]
java: [ 21 ]
os: [ ubuntu-latest, macos-latest ]

name: JDK${{ matrix.java }} on ${{ matrix.os }}
runs-on: ${{ matrix.os }}
Expand All @@ -25,7 +25,7 @@ jobs:
fetch-depth: 0

- name: Setup Java
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: ${{ matrix.java }}
Expand All @@ -34,4 +34,4 @@ jobs:
- name: Build and (headless) test with Maven
uses: smithki/[email protected]
with:
run: mvn -U -B -ntp package
run: mvn -U -B -ntp verify
32 changes: 20 additions & 12 deletions .github/workflows/java8-maven.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ jobs:
strategy:
fail-fast: false
matrix:
java: [ 8, 17 ]
os: [ ubuntu-latest, macOS-latest, windows-latest ]
java: [ 8, 21 ]
os: [ ubuntu-latest, macos-13, windows-latest ]

name: JDK${{ matrix.java }} on ${{ matrix.os }}
runs-on: ${{ matrix.os }}
Expand All @@ -22,19 +22,23 @@ jobs:
fetch-depth: 0

- name: Setup Java
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: ${{ matrix.java }}
cache: 'maven'

- name: Pre-download dependencies with Maven
run: mvn -U -B -ntp dependency:go-offline
uses: nick-fields/retry@v3
with:
command: mvn -U -B -ntp dependency:go-offline
max_attempts: 3
timeout_minutes: 5

- name: Build and (headless) test with Maven
uses: smithki/[email protected]
with:
run: mvn -U -B -ntp package
run: mvn -U -B -ntp verify

auto-merge-job:
needs: build-and-test-job
Expand All @@ -48,7 +52,11 @@ jobs:

steps:
- name: Merge PR
run: gh pr merge --auto --rebase "$PR_URL"
uses: nick-fields/retry@v3
with:
command: gh pr merge --auto --rebase "$PR_URL"
max_attempts: 3
timeout_minutes: 5
env:
PR_URL: ${{github.event.pull_request.html_url}}
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
Expand All @@ -58,7 +66,7 @@ jobs:
if: startsWith(github.repository, 'nbbrd/') && startsWith(github.ref, 'refs/heads/develop')
strategy:
matrix:
java: [ 17 ]
java: [ 21 ]
os: [ ubuntu-latest ]

name: Snapshot on develop
Expand All @@ -72,7 +80,7 @@ jobs:
fetch-depth: 0

- name: Setup Java
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: ${{ matrix.java }}
Expand All @@ -96,7 +104,7 @@ jobs:

- name: Upload JReleaser output
if: always()
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: assets-snapshot-log
path: |
Expand All @@ -108,7 +116,7 @@ jobs:
if: startsWith(github.repository, 'nbbrd/') && startsWith(github.ref, 'refs/tags/v')
strategy:
matrix:
java: [ 17 ]
java: [ 21 ]
os: [ ubuntu-latest ]

name: Release on tag
Expand All @@ -122,7 +130,7 @@ jobs:
fetch-depth: 0

- name: Setup Java
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: ${{ matrix.java }}
Expand All @@ -148,7 +156,7 @@ jobs:

- name: Upload JReleaser output
if: always()
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: assets-release-log
path: |
Expand Down
Loading

0 comments on commit 9bc1428

Please sign in to comment.