From 00da89b4c0534b3dbd5014d7f8fdcbab42ea9245 Mon Sep 17 00:00:00 2001 From: HugoGranstrom <5092565+HugoGranstrom@users.noreply.github.com> Date: Thu, 3 Aug 2023 14:13:09 +0200 Subject: [PATCH 1/8] add converter from new default set type --- src/nimiSlides.nim | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/nimiSlides.nim b/src/nimiSlides.nim index a1cc717..30991bf 100644 --- a/src/nimiSlides.nim +++ b/src/nimiSlides.nim @@ -411,6 +411,9 @@ proc toSet*(x: Slice[int]): set[range[0..65535]] = proc toSet*(x: seq[Slice[int]]): set[range[0..65535]] = for s in x: result.incl s.toSet() +proc toSet*(x: set[range[0..255]]): set[range[0..65535]] = + for y in x: + result.incl y template animateCode*(lines: string, body: untyped) = From 5c750cadd97b95c81503195e05c77afb2555caca Mon Sep 17 00:00:00 2001 From: HugoGranstrom <5092565+HugoGranstrom@users.noreply.github.com> Date: Thu, 3 Aug 2023 14:20:53 +0200 Subject: [PATCH 2/8] try CI matrix --- .github/workflows/valid.yml | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/.github/workflows/valid.yml b/.github/workflows/valid.yml index 86075ef..6484e8a 100644 --- a/.github/workflows/valid.yml +++ b/.github/workflows/valid.yml @@ -6,13 +6,21 @@ on: - main jobs: - gen: - name: Validate PR - runs-on: ubuntu-latest - + tests: + runs-on: ubuntu-latest + strategy: + matrix: + nim: + - 'binary:1.6.x' + - 'binary:stable' + - 'devel' + fail-fast: false + name: Nim ${{ matrix.nim }} steps: - uses: actions/checkout@v2 - uses: iffy/install-nim@v4 + with: + version: ${{ matrix.version }} - name: Install deps run: | nimble install -y From 02b702cdc7714098a439f7af7dd6d6a87286c0cc Mon Sep 17 00:00:00 2001 From: HugoGranstrom <5092565+HugoGranstrom@users.noreply.github.com> Date: Thu, 3 Aug 2023 14:21:35 +0200 Subject: [PATCH 3/8] name valid to tests --- .github/workflows/valid.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/valid.yml b/.github/workflows/valid.yml index 6484e8a..ba9bc06 100644 --- a/.github/workflows/valid.yml +++ b/.github/workflows/valid.yml @@ -1,4 +1,4 @@ -name: Generate nimiSlides docs +name: Tests on: pull_request: From 8f4798740cae70a3ee1c18df56cca144791f413b Mon Sep 17 00:00:00 2001 From: HugoGranstrom <5092565+HugoGranstrom@users.noreply.github.com> Date: Thu, 3 Aug 2023 14:25:11 +0200 Subject: [PATCH 4/8] typo --- .github/workflows/valid.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/valid.yml b/.github/workflows/valid.yml index ba9bc06..02a8d20 100644 --- a/.github/workflows/valid.yml +++ b/.github/workflows/valid.yml @@ -20,7 +20,7 @@ jobs: - uses: actions/checkout@v2 - uses: iffy/install-nim@v4 with: - version: ${{ matrix.version }} + version: ${{ matrix.nim }} - name: Install deps run: | nimble install -y From 66ffbf0b8b8075ab963523f0c1ef9da6f20dd19b Mon Sep 17 00:00:00 2001 From: HugoGranstrom <5092565+HugoGranstrom@users.noreply.github.com> Date: Thu, 3 Aug 2023 14:27:12 +0200 Subject: [PATCH 5/8] remove binary for 1.6.x --- .github/workflows/valid.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/valid.yml b/.github/workflows/valid.yml index 02a8d20..b21941e 100644 --- a/.github/workflows/valid.yml +++ b/.github/workflows/valid.yml @@ -11,7 +11,7 @@ jobs: strategy: matrix: nim: - - 'binary:1.6.x' + - '1.6.x' - 'binary:stable' - 'devel' fail-fast: false From 8f98714a9539898a8ba9b3c7073b0b595b127b08 Mon Sep 17 00:00:00 2001 From: HugoGranstrom <5092565+HugoGranstrom@users.noreply.github.com> Date: Thu, 3 Aug 2023 14:31:45 +0200 Subject: [PATCH 6/8] use different workflow for installing nim --- .github/workflows/valid.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/valid.yml b/.github/workflows/valid.yml index b21941e..f87fa1a 100644 --- a/.github/workflows/valid.yml +++ b/.github/workflows/valid.yml @@ -12,15 +12,16 @@ jobs: matrix: nim: - '1.6.x' - - 'binary:stable' + - 'stable' - 'devel' fail-fast: false name: Nim ${{ matrix.nim }} steps: - uses: actions/checkout@v2 - - uses: iffy/install-nim@v4 + - uses: jiro4989/setup-nim-action@v1 with: version: ${{ matrix.nim }} + repo-token: ${{ secrets.GITHUB_TOKEN }} - name: Install deps run: | nimble install -y From 13dfec53f87ef8dd3071c9dca7ebdaed602d0869 Mon Sep 17 00:00:00 2001 From: HugoGranstrom <5092565+HugoGranstrom@users.noreply.github.com> Date: Thu, 3 Aug 2023 14:55:28 +0200 Subject: [PATCH 7/8] bump nimble version --- nimiSlides.nimble | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nimiSlides.nimble b/nimiSlides.nimble index 41fefca..3c45c25 100644 --- a/nimiSlides.nimble +++ b/nimiSlides.nimble @@ -1,6 +1,6 @@ # Package -version = "0.2.3" +version = "0.2.4" author = "Hugo Granström" description = "Reveal.js theme for nimib" license = "MIT" @@ -14,7 +14,7 @@ requires "nimib >= 0.3.9" import os task docsDeps, "install dependencies required to build docs": - exec "nimble -y install ggplotnim@0.5.6 karax numericalnim nimibook@#head" + exec "nimble -y install ggplotnim@0.5.6 karax numericalnim nimibook" task buildDocs, "build all .nim files in docsrc/": for path in ["showcase.nim", "nimconf2022.nim", "miscSlides.nim", "index_old.nim", "fragments.nim"]: From 8608f4c44ddbc3c6fc4b3a2a1c3960d8e4115d9e Mon Sep 17 00:00:00 2001 From: HugoGranstrom <5092565+HugoGranstrom@users.noreply.github.com> Date: Thu, 3 Aug 2023 15:51:50 +0200 Subject: [PATCH 8/8] use nimibook head --- nimiSlides.nimble | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nimiSlides.nimble b/nimiSlides.nimble index 3c45c25..fefaa16 100644 --- a/nimiSlides.nimble +++ b/nimiSlides.nimble @@ -14,7 +14,7 @@ requires "nimib >= 0.3.9" import os task docsDeps, "install dependencies required to build docs": - exec "nimble -y install ggplotnim@0.5.6 karax numericalnim nimibook" + exec "nimble -y install ggplotnim@0.5.6 karax numericalnim nimibook@#head" task buildDocs, "build all .nim files in docsrc/": for path in ["showcase.nim", "nimconf2022.nim", "miscSlides.nim", "index_old.nim", "fragments.nim"]: