From 59aa3cb0e64b1dfe4bacbc8f525ae0606b685410 Mon Sep 17 00:00:00 2001 From: Jacek Sieka Date: Sun, 15 Dec 2024 10:38:38 +0100 Subject: [PATCH 01/15] Select nim version with nimble --- .github/workflows/ci.yml | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c61c445..9438744 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -8,7 +8,7 @@ on: workflow_dispatch: inputs: branch: - default: '"stable"' + default: '"== 2.2"' concurrency: # Cancel stale PR builds (but not push builds) group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }} @@ -19,7 +19,7 @@ jobs: strategy: fail-fast: false matrix: - branch: ${{ fromJSON(format('[{0}]', inputs.branch || '"1.2.0","1.2.x","1.4.2","1.4.x","1.6.0","1.6.x","2.0.0","2.0.x","stable","devel"')) }} + branch: ${{ fromJSON(format('[{0}]', inputs.branch || '"== 1.2.0",">= 1.2.x","== 1.4.2",">= 1.4.2","== 1.6.0",">= 1.6.x","== 2.0.0",">= 2.0.0","== 2.2.0", >= 2.2.0", "#head"')) }} name: 'nim-${{matrix.branch}}' runs-on: ubuntu-latest @@ -27,16 +27,15 @@ jobs: - name: Checkout uses: actions/checkout@v4 - - uses: jiro4989/setup-nim-action@v1 + - uses: nim-lang/setup-nimble-action@v1 with: - nim-version: ${{ matrix.branch }} + nimble-version: 0.16.4 repo-token: ${{ secrets.GITHUB_TOKEN }} - name: Run tests run: | - nim --version - env TEST_LANG="c" nimble test - env TEST_LANG="cpp" nimble test + env TEST_LANG="c" nimble test --requires="nim ${{matrix.branch}}" + env TEST_LANG="cpp" nimble test --requires="nim ${{matrix.branch}}" lint: From aabc8b377fbe85d737830b6b4429d5b814c3a908 Mon Sep 17 00:00:00 2001 From: Jacek Sieka Date: Sun, 15 Dec 2024 10:39:59 +0100 Subject: [PATCH 02/15] --amend --- .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 9438744..784e196 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,7 +19,7 @@ jobs: strategy: fail-fast: false matrix: - branch: ${{ fromJSON(format('[{0}]', inputs.branch || '"== 1.2.0",">= 1.2.x","== 1.4.2",">= 1.4.2","== 1.6.0",">= 1.6.x","== 2.0.0",">= 2.0.0","== 2.2.0", >= 2.2.0", "#head"')) }} + branch: ${{ fromJSON(format('[{0}]', inputs.branch || '"== 1.2.0",">= 1.2.x","== 1.4.2",">= 1.4.2","== 1.6.0",">= 1.6.x","== 2.0.0",">= 2.0.0","== 2.2.0",">= 2.2.0","#head"')) }} name: 'nim-${{matrix.branch}}' runs-on: ubuntu-latest From 5bba6c298c7351c310699b3f76b52d94e26190a5 Mon Sep 17 00:00:00 2001 From: Jacek Sieka Date: Sun, 15 Dec 2024 15:42:25 +0100 Subject: [PATCH 03/15] --amend --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 784e196..5cb0129 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,9 +19,9 @@ jobs: strategy: fail-fast: false matrix: - branch: ${{ fromJSON(format('[{0}]', inputs.branch || '"== 1.2.0",">= 1.2.x","== 1.4.2",">= 1.4.2","== 1.6.0",">= 1.6.x","== 2.0.0",">= 2.0.0","== 2.2.0",">= 2.2.0","#head"')) }} + branch: ${{ fromJSON(format('[{0}]', inputs.branch || '"== 1.2.0",">= 1.2.x","== 1.4.2",">= 1.4.2","== 1.6.0",">= 1.6.0","== 2.0.0",">= 2.0.0","== 2.2.0",">= 2.2.0","@#head"')) }} - name: 'nim-${{matrix.branch}}' + name: 'nim ${{matrix.branch}}' runs-on: ubuntu-latest steps: - name: Checkout From 75e359010a214fee3bc18ed5b516d9afb0064f4d Mon Sep 17 00:00:00 2001 From: Jacek Sieka Date: Mon, 13 Jan 2025 12:11:55 +0100 Subject: [PATCH 04/15] version ops --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5cb0129..d5c0f9e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,7 +19,7 @@ jobs: strategy: fail-fast: false matrix: - branch: ${{ fromJSON(format('[{0}]', inputs.branch || '"== 1.2.0",">= 1.2.x","== 1.4.2",">= 1.4.2","== 1.6.0",">= 1.6.0","== 2.0.0",">= 2.0.0","== 2.2.0",">= 2.2.0","@#head"')) }} + branch: ${{ fromJSON(format('[{0}]', inputs.branch || '"== 1.2.0","~= 1.2.x","== 1.4.2","~= 1.4.2","== 1.6.0","~= 1.6.0","== 2.0.0","~= 2.0.0","== 2.2.0","~= 2.2.0","@#head"')) }} name: 'nim ${{matrix.branch}}' runs-on: ubuntu-latest @@ -55,4 +55,4 @@ jobs: curl -L "https://github.com/arnetheduck/nph/releases/download/${VERSION}/${ARCHIVE}" -o ${ARCHIVE} tar -xzf ${ARCHIVE} ./nph . - git diff --exit-code \ No newline at end of file + git diff --exit-code From a8fb5b88ee2e657daf6412db7062380c659fb740 Mon Sep 17 00:00:00 2001 From: Jacek Sieka Date: Thu, 11 Dec 2025 08:11:54 +0100 Subject: [PATCH 05/15] bump --- .github/workflows/ci.yml | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d5c0f9e..82befea 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -25,11 +25,11 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v4 + uses: actions/checkout@v6 - uses: nim-lang/setup-nimble-action@v1 with: - nimble-version: 0.16.4 + nimble-version: 0.20.1 repo-token: ${{ secrets.GITHUB_TOKEN }} - name: Run tests @@ -43,16 +43,9 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v4 + uses: actions/checkout@v6 + - name: Check `nph` formatting + uses: arnetheduck/nph-action@v1 with: - fetch-depth: 2 # In PR, has extra merge commit: ^1 = PR, ^2 = base - - - name: Check nph formatting - # Pin nph to a specific version to avoid sudden style differences. - run: | - VERSION="v0.6.0" - ARCHIVE="nph-linux_x64.tar.gz" - curl -L "https://github.com/arnetheduck/nph/releases/download/${VERSION}/${ARCHIVE}" -o ${ARCHIVE} - tar -xzf ${ARCHIVE} - ./nph . - git diff --exit-code + version: latest + options: "." From 6f91b8d4da2d71fe9f8f61477b881c833462f5ba Mon Sep 17 00:00:00 2001 From: Jacek Sieka Date: Thu, 11 Dec 2025 08:17:05 +0100 Subject: [PATCH 06/15] bump --- tests/test_results.nim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test_results.nim b/tests/test_results.nim index d434e73..fb22370 100644 --- a/tests/test_results.nim +++ b/tests/test_results.nim @@ -143,7 +143,7 @@ block: try: echo rErr[] doAssert false - except: + except Exception: discard when (NimMajor, NimMinor, NimPatch) >= (1, 6, 12): From d75790adfeebcdd0f0520b559f31b01ef9369fdc Mon Sep 17 00:00:00 2001 From: Jacek Sieka Date: Thu, 11 Dec 2025 08:18:56 +0100 Subject: [PATCH 07/15] bump --- .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 82befea..7117b48 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,7 +19,7 @@ jobs: strategy: fail-fast: false matrix: - branch: ${{ fromJSON(format('[{0}]', inputs.branch || '"== 1.2.0","~= 1.2.x","== 1.4.2","~= 1.4.2","== 1.6.0","~= 1.6.0","== 2.0.0","~= 2.0.0","== 2.2.0","~= 2.2.0","@#head"')) }} + branch: ${{ fromJSON(format('[{0}]', inputs.branch || '"== 1.2.0","~= 1.2.x","== 1.4.2","~= 1.4.2","== 1.6.0","~= 1.6.0","== 2.0.0","~= 2.0.0","== 2.2.0","~= 2.2.0","#head"')) }} name: 'nim ${{matrix.branch}}' runs-on: ubuntu-latest From bd28127d5517ec64950b97707752cc18f883850a Mon Sep 17 00:00:00 2001 From: Jacek Sieka Date: Thu, 11 Dec 2025 08:27:59 +0100 Subject: [PATCH 08/15] bump --- .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 7117b48..548cc02 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -29,7 +29,7 @@ jobs: - uses: nim-lang/setup-nimble-action@v1 with: - nimble-version: 0.20.1 + nimble-version: 22b07648f5d05d3f3cc105a6888ece51f338e29c repo-token: ${{ secrets.GITHUB_TOKEN }} - name: Run tests From 6d36b91a2f9581b51540d4158c6f8940e090527d Mon Sep 17 00:00:00 2001 From: Jacek Sieka Date: Thu, 11 Dec 2025 08:31:06 +0100 Subject: [PATCH 09/15] bump --- .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 548cc02..1f1d468 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -29,7 +29,7 @@ jobs: - uses: nim-lang/setup-nimble-action@v1 with: - nimble-version: 22b07648f5d05d3f3cc105a6888ece51f338e29c + nimble-version: "22b07648f5d05d3f3cc105a6888ece51f338e29c" repo-token: ${{ secrets.GITHUB_TOKEN }} - name: Run tests From 3d1ebc72a083b4d6852e83e4bc42c3a9bed87d21 Mon Sep 17 00:00:00 2001 From: Jacek Sieka Date: Thu, 11 Dec 2025 08:32:08 +0100 Subject: [PATCH 10/15] prev --- .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 1f1d468..df39b85 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -29,7 +29,7 @@ jobs: - uses: nim-lang/setup-nimble-action@v1 with: - nimble-version: "22b07648f5d05d3f3cc105a6888ece51f338e29c" + nimble-version: "80c5afd39a279c619a9cd93890355acf06ef55a6" repo-token: ${{ secrets.GITHUB_TOKEN }} - name: Run tests From 202f66a37290d87bb47b7a4bb8bbeb0bae6074e5 Mon Sep 17 00:00:00 2001 From: Jacek Sieka Date: Thu, 11 Dec 2025 21:49:00 +0100 Subject: [PATCH 11/15] nightly --- .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 df39b85..3ab68f2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -29,7 +29,7 @@ jobs: - uses: nim-lang/setup-nimble-action@v1 with: - nimble-version: "80c5afd39a279c619a9cd93890355acf06ef55a6" + nimble-version: "nightly" repo-token: ${{ secrets.GITHUB_TOKEN }} - name: Run tests From ea0566c76eb6b08d0c78c6fbaec552b13dc0f709 Mon Sep 17 00:00:00 2001 From: Jacek Sieka Date: Thu, 11 Dec 2025 21:51:56 +0100 Subject: [PATCH 12/15] nightly --- .github/workflows/ci.yml | 6 +++--- results.nimble | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3ab68f2..a9fa147 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,7 +19,7 @@ jobs: strategy: fail-fast: false matrix: - branch: ${{ fromJSON(format('[{0}]', inputs.branch || '"== 1.2.0","~= 1.2.x","== 1.4.2","~= 1.4.2","== 1.6.0","~= 1.6.0","== 2.0.0","~= 2.0.0","== 2.2.0","~= 2.2.0","#head"')) }} + branch: ${{ fromJSON(format('[{0}]', inputs.branch || '" == 1.2.0"," ~= 1.2.x"," == 1.4.2"," ~= 1.4.2"," == 1.6.0"," ~= 1.6.0"," == 2.0.0"," ~= 2.0.0"," == 2.2.0"," ~= 2.2.0","#head"')) }} name: 'nim ${{matrix.branch}}' runs-on: ubuntu-latest @@ -34,8 +34,8 @@ jobs: - name: Run tests run: | - env TEST_LANG="c" nimble test --requires="nim ${{matrix.branch}}" - env TEST_LANG="cpp" nimble test --requires="nim ${{matrix.branch}}" + env TEST_LANG="c" nimble test --requires="nim${{matrix.branch}}" + env TEST_LANG="cpp" nimble test --requires="nim${{matrix.branch}}" lint: diff --git a/results.nimble b/results.nimble index e58e292..666f316 100644 --- a/results.nimble +++ b/results.nimble @@ -21,7 +21,7 @@ task test, "Runs the test suite": for opt in ["-d:resultsGenericsOpenSym:false", "-d:resultsGenericsOpenSym:true"]: test opt, "tests/" & f if (NimMajor, NimMinor) >= (2, 0): - test opt & " --mm:refc", "tests/" & f + test opt & " --gc:refc", "tests/" & f task bench, "Run benchmark": test "-d:release", "benchmarks/benchmark.nim" From 6fe7c4a3fe578f59372985cfd6f241e76326d9de Mon Sep 17 00:00:00 2001 From: Jacek Sieka Date: Thu, 11 Dec 2025 21:54:13 +0100 Subject: [PATCH 13/15] nightly --- .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 a9fa147..aa77059 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,7 +19,7 @@ jobs: strategy: fail-fast: false matrix: - branch: ${{ fromJSON(format('[{0}]', inputs.branch || '" == 1.2.0"," ~= 1.2.x"," == 1.4.2"," ~= 1.4.2"," == 1.6.0"," ~= 1.6.0"," == 2.0.0"," ~= 2.0.0"," == 2.2.0"," ~= 2.2.0","#head"')) }} + branch: ${{ fromJSON(format('[{0}]', inputs.branch || '" == 1.2.0"," ~= 1.2.0"," == 1.4.2"," ~= 1.4.2"," == 1.6.0"," ~= 1.6.0"," == 2.0.0"," ~= 2.0.0"," == 2.2.0"," ~= 2.2.0","#head"')) }} name: 'nim ${{matrix.branch}}' runs-on: ubuntu-latest From 1ddf11faa47235db60e605083431ce1c58db9fdb Mon Sep 17 00:00:00 2001 From: Jacek Sieka Date: Thu, 11 Dec 2025 21:57:24 +0100 Subject: [PATCH 14/15] nightly --- .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 aa77059..76b0349 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,7 +19,7 @@ jobs: strategy: fail-fast: false matrix: - branch: ${{ fromJSON(format('[{0}]', inputs.branch || '" == 1.2.0"," ~= 1.2.0"," == 1.4.2"," ~= 1.4.2"," == 1.6.0"," ~= 1.6.0"," == 2.0.0"," ~= 2.0.0"," == 2.2.0"," ~= 2.2.0","#head"')) }} + branch: ${{ fromJSON(format('[{0}]', inputs.branch || '" == 1.2.0"," ~= 1.2.0"," == 1.4.2"," ~= 1.4.2"," == 1.6.0"," ~= 1.6.0"," == 2.0.0"," ~= 2.0.0"," == 2.2.0"," ~= 2.2.0","@#head"')) }} name: 'nim ${{matrix.branch}}' runs-on: ubuntu-latest From c87afbd068367a3277c4da985eebf13f50d48b2a Mon Sep 17 00:00:00 2001 From: Jacek Sieka Date: Thu, 11 Dec 2025 21:59:32 +0100 Subject: [PATCH 15/15] nightly --- .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 76b0349..af9aa30 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,7 +19,7 @@ jobs: strategy: fail-fast: false matrix: - branch: ${{ fromJSON(format('[{0}]', inputs.branch || '" == 1.2.0"," ~= 1.2.0"," == 1.4.2"," ~= 1.4.2"," == 1.6.0"," ~= 1.6.0"," == 2.0.0"," ~= 2.0.0"," == 2.2.0"," ~= 2.2.0","@#head"')) }} + branch: ${{ fromJSON(format('[{0}]', inputs.branch || '" == 1.2.0"," ~= 1.2.0"," == 1.4.2"," ~= 1.4.2"," == 1.6.0"," ~= 1.6.0"," == 2.0.0"," ~= 2.0.0"," == 2.2.0"," ~= 2.2.0","#devel"')) }} name: 'nim ${{matrix.branch}}' runs-on: ubuntu-latest