From 40d80a80025d286203c0cd4ef6394890fe7c32bf Mon Sep 17 00:00:00 2001 From: Vindaar Date: Tue, 24 Feb 2026 12:41:58 +0100 Subject: [PATCH 1/9] update ginger dependency --- ggplotnim.nimble | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ggplotnim.nimble b/ggplotnim.nimble index 441b1fa3..604254fa 100644 --- a/ggplotnim.nimble +++ b/ggplotnim.nimble @@ -10,7 +10,7 @@ srcDir = "src" requires "nim >= 1.0.0" requires "https://github.com/Vindaar/seqmath >= 0.1.16" -requires "ginger == 0.6.1" +requires "ginger == 0.6.2" requires "datamancer >= 0.5.1" requires "arraymancer >= 0.7.22" requires "shell >= 0.4.3" From 94317643dc716d2deafb0d22f0f6687fe4dc35de Mon Sep 17 00:00:00 2001 From: Vindaar Date: Tue, 24 Feb 2026 12:45:16 +0100 Subject: [PATCH 2/9] update webkit dep on ubuntu --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f7a9559a..5eec8228 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -49,7 +49,7 @@ jobs: sudo apt-get update sudo apt-get install libcairo2 libcairo2-dev imagemagick \ libgtk-3-dev webkit2gtk-driver \ - libwebkit2gtk-4.0 libwebkit2gtk-4.0-dev pandoc + libwebkit2gtk-4.1-0 libwebkit2gtk-4.1-dev - name: Install dependencies (OSX) if: ${{matrix.target == 'macos'}} From 5d1706339235a6751a1c450542b8848e1db247d2 Mon Sep 17 00:00:00 2001 From: Vindaar Date: Tue, 24 Feb 2026 12:52:04 +0100 Subject: [PATCH 3/9] update setup nim to work on macos --- .github/workflows/ci.yml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5eec8228..b96898d5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -20,7 +20,7 @@ jobs: strategy: fail-fast: false matrix: - branch: [version-2-0, version-1-6, devel] + nim: ['2.2.x', 'devel'] target: [linux, macos, windows] include: - target: linux @@ -29,7 +29,7 @@ jobs: builder: macos-latest - target: windows builder: windows-latest - name: '${{ matrix.target }} (${{ matrix.branch }})' + name: '${{ matrix.target }} (${{ matrix.nim }})' runs-on: ${{ matrix.builder }} steps: - name: Checkout @@ -38,10 +38,11 @@ jobs: path: ggplotnim - name: Setup Nim - uses: alaviss/setup-nim@0.1.1 + uses: jiro4989/setup-nim-action@v2 with: - path: nim - version: ${{ matrix.branch }} + nim-version: ${{ matrix.nim }} + repo-token: ${{ secrets.GITHUB_TOKEN }} + use-nightlies: ${{ matrix.nim == 'devel' }} - name: Install dependencies (Ubuntu) if: ${{matrix.target == 'linux'}} @@ -101,7 +102,7 @@ jobs: - name: Build docs if: > github.event_name == 'push' && github.ref == 'refs/heads/master' && - matrix.target == 'linux' && matrix.branch == 'devel' + matrix.target == 'linux' && matrix.nim == 'devel' shell: bash run: | cd ggplotnim @@ -116,7 +117,7 @@ jobs: - name: Publish docs if: > github.event_name == 'push' && github.ref == 'refs/heads/master' && - matrix.target == 'linux' && matrix.branch == 'devel' + matrix.target == 'linux' && matrix.nim == 'devel' uses: crazy-max/ghaction-github-pages@v1 with: build_dir: ggplotnim/docs From 6ad15e987a7b30a20db4772e42f063a7381566c4 Mon Sep 17 00:00:00 2001 From: Vindaar Date: Tue, 24 Feb 2026 12:56:27 +0100 Subject: [PATCH 4/9] add lapack / blas explicitly to linux deps --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b96898d5..5511694e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -50,6 +50,7 @@ jobs: sudo apt-get update sudo apt-get install libcairo2 libcairo2-dev imagemagick \ libgtk-3-dev webkit2gtk-driver \ + liblapack3 liblapack-dev libblas3 libblas-dev \ libwebkit2gtk-4.1-0 libwebkit2gtk-4.1-dev - name: Install dependencies (OSX) From c1d06343918aebdd54da90633606129e0aad3370 Mon Sep 17 00:00:00 2001 From: Vindaar Date: Tue, 24 Feb 2026 13:16:31 +0100 Subject: [PATCH 5/9] depend on webview fork for webkit 4.1 --- ggplotnim.nimble | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ggplotnim.nimble b/ggplotnim.nimble index 604254fa..8f8ac2d0 100644 --- a/ggplotnim.nimble +++ b/ggplotnim.nimble @@ -14,7 +14,7 @@ requires "ginger == 0.6.2" requires "datamancer >= 0.5.1" requires "arraymancer >= 0.7.22" requires "shell >= 0.4.3" -requires "webview" +requires "https://github.com/Vindaar/webview" requires "parsetoml" requires "https://github.com/SciNim/scinim >= 0.1.0" From 374146f8fb49acc7df7d9d45f64116b122740fae Mon Sep 17 00:00:00 2001 From: Vindaar Date: Tue, 24 Feb 2026 13:16:44 +0100 Subject: [PATCH 6/9] exclude windows devel --- .github/workflows/ci.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5511694e..19cac9c9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -29,6 +29,9 @@ jobs: builder: macos-latest - target: windows builder: windows-latest + exclude: + - target: windows + branch: devel name: '${{ matrix.target }} (${{ matrix.nim }})' runs-on: ${{ matrix.builder }} steps: From aa6ac3c8832754c1fef0d024695fc5837f9c8529 Mon Sep 17 00:00:00 2001 From: Vindaar Date: Tue, 24 Feb 2026 13:40:15 +0100 Subject: [PATCH 7/9] update changelog --- changelog.org | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/changelog.org b/changelog.org index 0bdc3574..55b87132 100644 --- a/changelog.org +++ b/changelog.org @@ -1,3 +1,7 @@ +* v0.7.6 +- hotfix for ~ginger~ dependency +- fix ~webview~ dependency +- fix CI for MacOS * v0.7.5 - add ~embed~ to embed multiple plots into a ~ginger~ ~Viewport~ with correct scaling of all plot objects From 5145a3f4d8723e1485efc8795a287fe7a12f6fcf Mon Sep 17 00:00:00 2001 From: Vindaar Date: Tue, 24 Feb 2026 13:41:19 +0100 Subject: [PATCH 8/9] take out maybe wrong YAML CI lines --- .github/workflows/ci.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 19cac9c9..5511694e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -29,9 +29,6 @@ jobs: builder: macos-latest - target: windows builder: windows-latest - exclude: - - target: windows - branch: devel name: '${{ matrix.target }} (${{ matrix.nim }})' runs-on: ${{ matrix.builder }} steps: From 60979cb165240087aa6e75cd48f0d9c643a3a180 Mon Sep 17 00:00:00 2001 From: Vindaar Date: Tue, 24 Feb 2026 13:50:08 +0100 Subject: [PATCH 9/9] fix exclusion of windows Used old branch instead of nim... --- .github/workflows/ci.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5511694e..9c730a85 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -29,6 +29,9 @@ jobs: builder: macos-latest - target: windows builder: windows-latest + exclude: + - target: windows + nim: devel name: '${{ matrix.target }} (${{ matrix.nim }})' runs-on: ${{ matrix.builder }} steps: