diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f7a9559a..9c730a85 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,10 @@ jobs: builder: macos-latest - target: windows builder: windows-latest - name: '${{ matrix.target }} (${{ matrix.branch }})' + exclude: + - target: windows + nim: devel + name: '${{ matrix.target }} (${{ matrix.nim }})' runs-on: ${{ matrix.builder }} steps: - name: Checkout @@ -38,10 +41,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'}} @@ -49,7 +53,8 @@ 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 + liblapack3 liblapack-dev libblas3 libblas-dev \ + libwebkit2gtk-4.1-0 libwebkit2gtk-4.1-dev - name: Install dependencies (OSX) if: ${{matrix.target == 'macos'}} @@ -101,7 +106,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 +121,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 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 diff --git a/ggplotnim.nimble b/ggplotnim.nimble index 441b1fa3..8f8ac2d0 100644 --- a/ggplotnim.nimble +++ b/ggplotnim.nimble @@ -10,11 +10,11 @@ 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" -requires "webview" +requires "https://github.com/Vindaar/webview" requires "parsetoml" requires "https://github.com/SciNim/scinim >= 0.1.0"