Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 13 additions & 8 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -38,18 +41,20 @@ 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'}}
run: |
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'}}
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down
4 changes: 4 additions & 0 deletions changelog.org
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions ggplotnim.nimble
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
Loading