Merge branch 'develop'

nbbrd · Oct 20, 2024 · 5a2e44d · 5a2e44d
2 parents 468ab31 + 0c24d44
commit 5a2e44d
Show file tree

Hide file tree

Showing 24 changed files with 273 additions and 93 deletions.
diff --git a/.github/workflows/check-links.yml b/.github/workflows/check-links.yml
@@ -34,7 +34,7 @@ jobs:
 
       - name: Check links
         id: lychee
-        uses: lycheeverse/lychee-action@v1.9.3
+        uses: lycheeverse/lychee-action@v2.0.2
         with:
           fail: true
           args: --max-concurrency 1 --cache --no-progress --exclude-all-private './**/*.md'
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -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/jbang-action@v0.119.0
+        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
@@ -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'
 
@@ -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
@@ -68,7 +81,7 @@ jobs:
             $-jbang-
 
       - name: Create index.html
-        uses: jbangdev/jbang-action@main
+        uses: jbangdev/jbang-action@v0.119.0
         with:
           trust: https://gist.github.com/charphi/
           script: https://gist.github.com/charphi/f44a24eb35dbd61b9f1d7759f0e561bd
@@ -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

diff --git a/.github/workflows/heylogs.yml b/.github/workflows/heylogs.yml
@@ -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
diff --git a/.github/workflows/hugo-geekdoc.yml b/.github/workflows/hugo-geekdoc.yml
@@ -43,7 +43,7 @@ jobs:
 
       - name: Create Pull Request
         id: cpr
-        uses: peter-evans/create-pull-request@v6
+        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 }}

diff --git a/.github/workflows/java-ea-maven.yml b/.github/workflows/java-ea-maven.yml
@@ -12,7 +12,7 @@ jobs:
       fail-fast: false
       matrix:
         java: [ 21 ]
-        os: [ ubuntu-latest ]
+        os: [ ubuntu-latest, macos-latest ]
 
     name: JDK${{ matrix.java }} on ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
@@ -31,7 +31,10 @@ jobs:
           java-version: ${{ matrix.java }}
           cache: 'maven'
 
-      - name: Build and (headless) test with Maven
-        uses: smithki/xvfb-action@v1.1.2
-        with:
-          run: mvn -U -B -ntp package
+      - name: Build and (headless) test with Maven (Linux)
+        if: ${{ runner.os == 'Linux' }}
+        run: xvfb-run mvn -U -B -ntp verify
+
+      - name: Build and (headless) test with Maven (Windows and macOS)
+        if: ${{ runner.os != 'Linux' }}
+        run: mvn -U -B -ntp verify
diff --git a/.github/workflows/java8-maven.yml b/.github/workflows/java8-maven.yml
@@ -9,7 +9,7 @@ jobs:
       fail-fast: false
       matrix:
 #        java: [ 8, 21 ]
-#        os: [ ubuntu-latest, macOS-latest, windows-latest ]
+#        os: [ ubuntu-latest, macos-13, windows-latest ]
         java: [ 21 ]
         os: [ ubuntu-latest ]
 
@@ -31,12 +31,19 @@ jobs:
           cache: 'maven'
 
       - name: Pre-download dependencies with Maven
-        run: mvn -U -B -ntp dependency:go-offline
-
-      - name: Build and (headless) test with Maven
-        uses: smithki/xvfb-action@v1.1.2
+        uses: nick-fields/retry@v3
         with:
-          run: mvn -U -B -ntp install
+          command: mvn -U -B -ntp dependency:go-offline
+          max_attempts: 3
+          timeout_minutes: 5
+
+      - name: Build and (headless) test with Maven (Linux)
+        if: ${{ runner.os == 'Linux' }}
+        run: xvfb-run mvn -U -B -ntp verify
+
+      - name: Build and (headless) test with Maven (Windows and macOS)
+        if: ${{ runner.os != 'Linux' }}
+        run: mvn -U -B -ntp verify
 
 #      - name: Ensure reproducible builds with Maven
 #        run: mvn -U -B -ntp clean verify artifact:compare -DskipTests
@@ -51,7 +58,11 @@ jobs:
     runs-on: ubuntu-latest
     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}}

diff --git a/.github/workflows/jbang-example.yml b/.github/workflows/jbang-example.yml
@@ -5,7 +5,7 @@ on: workflow_dispatch
 jobs:
   run-job:
     runs-on: ubuntu-latest
-    name: sdmx-dl version
+    name: heylogs version
     steps:
       - name: Setup cache
         uses: actions/cache@v4
@@ -15,17 +15,17 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-jbang-
 
-      - name: Print latest stable version of sdmx-dl using catalog
-        uses: jbangdev/jbang-action@main
+      - name: Print latest stable version of heylogs using catalog
+        uses: jbangdev/jbang-action@v0.119.0
         with:
           trust: https://github.com/nbbrd/jbang-catalog/
-          script: sdmx-dl@nbbrd
+          script: heylogs@nbbrd
           scriptargs: "--version"
         env:
           JBANG_REPO: ~/.jbang/repository
 
       - name: Print latest stable version of sdmx-dl using Maven coordinate
-        uses: jbangdev/jbang-action@main
+        uses: jbangdev/jbang-action@v0.119.0
         with:
           script: com.github.nbbrd.sdmx-dl:sdmx-dl-cli:RELEASE:bin
           scriptargs: "--version"

diff --git a/.github/workflows/qodana.yml b/.github/workflows/qodana.yml
@@ -15,9 +15,9 @@ jobs:
         with:
           fetch-depth: 0
       - name: 'Qodana Scan'
-        uses: JetBrains/qodana-action@v2023.3.1
+        uses: JetBrains/qodana-action@v2024.2.3
       - name: Deploy to GitHub Pages
-        uses: peaceiris/actions-gh-pages@v3
+        uses: peaceiris/actions-gh-pages@v4
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           publish_dir: ${{ runner.temp }}/qodana/results/report

diff --git a/.github/workflows/update-changelogs.yml b/.github/workflows/update-changelogs.yml
@@ -0,0 +1,31 @@
+name: Update changelogs
+
+on: workflow_dispatch
+
+jobs:
+  update-changelogs:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Download
+        run: |
+          curl -s -o jdplus-benchmarking.md https://raw.githubusercontent.com/jdemetra/jdplus-benchmarking/develop/CHANGELOG.md
+          curl -s -o jdplus-incubator.md https://raw.githubusercontent.com/jdemetra/jdplus-incubator/develop/CHANGELOG.md
+          curl -s -o jdplus-experimental.md https://raw.githubusercontent.com/jdemetra/jdplus-experimental/develop/CHANGELOG.md
+          curl -s -o jdplus-revisions.md https://raw.githubusercontent.com/jdemetra/jdplus-revisions/develop/CHANGELOG.md
+          curl -s -o jdplus-nowcasting.md https://raw.githubusercontent.com/jdemetra/jdplus-nowcasting/develop/CHANGELOG.md
+
+      - name: Prepare
+        run: mkdir changelogs
+
+      - name: Scan
+        uses: jbangdev/jbang-action@v0.119.0
+        with:
+          script: com.github.nbbrd.heylogs:heylogs-cli:0.8.0:bin
+          scriptargs: "scan . -f json -o changelogs/scan.json"
+
+      - name: Deploy
+        uses: peaceiris/actions-gh-pages@v4
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          publish_dir: ./changelogs
+          destination_dir: ./changelogs
diff --git a/.gitignore b/.gitignore
@@ -2,6 +2,7 @@ target/
 /snapshots/
 /releases/
 .jbang/
-/docs/themes
 /docs/.hugo_build.lock
 /docs/public
+/docs/resources
+/docs/themes
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,11 +1,18 @@
 # Changelog
+
 All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
 
+## [2.4.5] - 2024-10-20
+
+### Added
+
+- Add Heylogs badge
+
 ## [2.3.0] - 2023-06-28
 
 ### Changed
@@ -15,65 +22,79 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [2.2.3] - 2022-09-28
 
 ### Changed
+
 - Use heylogs to check and extract changelog
 
 ## [2.0.1] - 2021-10-19
 
 ### Fixed
+
 - Fix artifactId for JBang
 
 ## [2.0.0] - 2021-10-19
 
 ### Changed
+
 - New API
 
 ### Added
+
 - GUI application
 - Add distribution to JBang
 
 ## [1.17.4] - 2021-07-16
 
 ### Added
+
 - Add version option to CLI
 
 ## [1.17.3] - 2021-07-15
 
 ### Added
+
 - Add distribution to Homebrew
 
 ### Changed
+
 - Set checksums as individual files
 
 ## [1.17.2] - 2021-07-15
 
 ### Fixed
+
 - Fix distribution name
 
 ## [1.17.1] - 2021-07-15
 
 ### Added
+
 - Enable semver check by using jitpack.io
 - Add distribution to Scoop
 
 ## [1.16.7] - 2021-07-15
 
 ### Added
+
 - Add semver check (disabled by default)
 - Add basic check of PGP signatures
 
 ### Changed
+
 - Remove deployment to GitHub packages
 - Release assets with JReleaser
 
 ## [1.15.0] - 2021-04-23
 
 ### Added
+
 - Add release deploy to GitHub Packages
 
 ### Fixed
+
 - Fix logic in maven deploy script
 
-[Unreleased]: https://github.com/nbbrd/sandbox/compare/v2.3.0...HEAD
+[Unreleased]: https://github.com/nbbrd/sandbox/compare/v2.4.5...HEAD
+[2.4.5]: https://github.com/nbbrd/sandbox/compare/v2.3.0...v2.4.5
 [2.3.0]: https://github.com/nbbrd/sandbox/compare/v2.2.3...v2.3.0
 [2.2.3]: https://github.com/nbbrd/sandbox/compare/v2.0.1...v2.2.3
 [2.0.1]: https://github.com/nbbrd/sandbox/compare/v2.0.0...v2.0.1

diff --git a/README.md b/README.md
@@ -1,9 +1,12 @@
 # sandbox
 
+[![Download](https://img.shields.io/github/release/nbbrd/sandbox.svg)](https://github.com/nbbrd/sandbox/releases/latest)
+[![Changes](https://img.shields.io/endpoint?url=https%3A%2F%2Fraw.githubusercontent.com%2Fnbbrd%2Fsandbox%2Fbadges%2Funreleased-changes.json)](https://github.com/nbbrd/sandbox/blob/develop/CHANGELOG.md)
+[![Qodana](https://github.com/nbbrd/sandbox/actions/workflows/qodana.yml/badge.svg)](https://github.com/nbbrd/sandbox/actions/workflows/qodana.yml)
+
 __This is not the project you are looking for.__
 
 ...123456...
 
 Documentation at https://nbbrd.github.io/sandbox/docs/develop/
 
-[![Qodana](https://github.com/nbbrd/sandbox/actions/workflows/qodana.yml/badge.svg)](https://github.com/nbbrd/sandbox/actions/workflows/qodana.yml)
diff --git a/docs/static/dependencies.csv → docs/assets/dependencies.csv b/docs/static/dependencies.csv → docs/assets/dependencies.csv
diff --git a/docs/content/dashboard.md b/docs/content/dashboard.md
@@ -0,0 +1,15 @@
+---
+title: "Dashboard"
+weight: 5
+---
+
+## JDemetra+ v3 extensions
+
+| Name                                                            | Status                                                                                                                                                                                                                                                                                                                                                                                          |
+|-----------------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| [Nowcasting](https://github.com/jdemetra/jdplus-nowcasting)     | [![Download](https://img.shields.io/github/release/jdemetra/jdplus-nowcasting.svg)](https://github.com/jdemetra/jdplus-nowcasting/releases/latest) [![Changes](https://img.shields.io/endpoint?url=https%3A%2F%2Fraw.githubusercontent.com%2Fjdemetra%2Fjdplus-nowcasting%2Fbadges%2Funreleased-changes.json)](https://github.com/jdemetra/jdplus-nowcasting/blob/develop/CHANGELOG.md)         |
+| [Revisions](https://github.com/jdemetra/jdplus-revisions)       | [![Download](https://img.shields.io/github/release/jdemetra/jdplus-revisions.svg)](https://github.com/jdemetra/jdplus-revisions/releases/latest) [![Changes](https://img.shields.io/endpoint?url=https%3A%2F%2Fraw.githubusercontent.com%2Fjdemetra%2Fjdplus-revisions%2Fbadges%2Funreleased-changes.json)](https://github.com/jdemetra/jdplus-revisions/blob/develop/CHANGELOG.md)             |
+| [Benchmarking](https://github.com/jdemetra/jdplus-benchmarking) | [![Download](https://img.shields.io/github/release/jdemetra/jdplus-benchmarking.svg)](https://github.com/jdemetra/jdplus-benchmarking/releases/latest) [![Changes](https://img.shields.io/endpoint?url=https%3A%2F%2Fraw.githubusercontent.com%2Fjdemetra%2Fjdplus-benchmarking%2Fbadges%2Funreleased-changes.json)](https://github.com/jdemetra/jdplus-benchmarking/blob/develop/CHANGELOG.md) |
+| [Experimental](https://github.com/jdemetra/jdplus-experimental) | [![Download](https://img.shields.io/github/release/jdemetra/jdplus-experimental.svg)](https://github.com/jdemetra/jdplus-experimental/releases/latest) [![Changes](https://img.shields.io/endpoint?url=https%3A%2F%2Fraw.githubusercontent.com%2Fjdemetra%2Fjdplus-experimental%2Fbadges%2Funreleased-changes.json)](https://github.com/jdemetra/jdplus-experimental/blob/develop/CHANGELOG.md) |
+| [Incubator](https://github.com/jdemetra/jdplus-incubator)       | [![Download](https://img.shields.io/github/release/jdemetra/jdplus-incubator.svg)](https://github.com/jdemetra/jdplus-incubator/releases/latest) [![Changes](https://img.shields.io/endpoint?url=https%3A%2F%2Fraw.githubusercontent.com%2Fjdemetra%2Fjdplus-incubator%2Fbadges%2Funreleased-changes.json)](https://github.com/jdemetra/jdplus-incubator/blob/develop/CHANGELOG.md)             |
+