From 605845204dd6cb7875c854a76b750d4372229d00 Mon Sep 17 00:00:00 2001 From: Jacek Sieka Date: Mon, 11 Mar 2024 08:32:06 +0100 Subject: [PATCH 1/5] ci: Combine c/c++ --- .github/workflows/ci.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f881a14..0d3eebb 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -7,7 +7,7 @@ on: workflow_dispatch: inputs: branch: - default: stable + default: '"stable"' concurrency: # Cancel stale PR builds (but not push builds) group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }} @@ -25,7 +25,7 @@ jobs: - os: linux cpu: amd64 TEST_LANG: cpp - branch: ${{ fromJSON(format('[{0}]', inputs.branch || '"1.2.x","1.4.x","1.6.x","2.0.x", "devel"')) }} + branch: ${{ fromJSON(format('[{0}]', inputs.branch || '"1.2.0","1.2.x","1.4.0","1.4.x","1.6.0","1.6.x","2.0.0","2.0.x","stable","devel"')) }} include: - target: os: linux @@ -34,7 +34,7 @@ jobs: run: shell: ${{ matrix.shell }} - name: 'nim-${{matrix.branch}}-${{ matrix.target.TEST_LANG }}' + name: 'nim-${{matrix.branch}}' runs-on: ubuntu-latest steps: - name: Checkout @@ -48,5 +48,6 @@ jobs: - name: Run tests run: | nim --version - env TEST_LANG="${{ matrix.target.TEST_LANG }}" nimble test + env TEST_LANG="c" nimble test + env TEST_LANG="cpp" nimble test From 33cd62c4a3e5f5a63052fced96a1c6ecb56f4aa4 Mon Sep 17 00:00:00 2001 From: Jacek Sieka Date: Mon, 11 Mar 2024 08:37:24 +0100 Subject: [PATCH 2/5] x --- .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 0d3eebb..f2e55ec 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -25,7 +25,7 @@ jobs: - os: linux cpu: amd64 TEST_LANG: cpp - branch: ${{ fromJSON(format('[{0}]', inputs.branch || '"1.2.0","1.2.x","1.4.0","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.x","1.6.2","1.6.x","2.0.0","2.0.x","stable","devel"')) }} include: - target: os: linux From faf4fa3e6964e6a208a070cbe52dc73041de3a93 Mon Sep 17 00:00:00 2001 From: Jacek Sieka Date: Mon, 11 Mar 2024 08:38:27 +0100 Subject: [PATCH 3/5] x --- .github/workflows/ci.yml | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f2e55ec..0f64566 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,21 +18,7 @@ jobs: strategy: fail-fast: false matrix: - target: - - os: linux - cpu: amd64 - TEST_LANG: c - - os: linux - cpu: amd64 - TEST_LANG: cpp branch: ${{ fromJSON(format('[{0}]', inputs.branch || '"1.2.0","1.2.x","1.4.2","1.4.x","1.6.2","1.6.x","2.0.0","2.0.x","stable","devel"')) }} - include: - - target: - os: linux - shell: bash - defaults: - run: - shell: ${{ matrix.shell }} name: 'nim-${{matrix.branch}}' runs-on: ubuntu-latest From 3d4df6ec3f50c0e245e77dadb305fd9bd28f2e6f Mon Sep 17 00:00:00 2001 From: Jacek Sieka Date: Mon, 11 Mar 2024 08:44:04 +0100 Subject: [PATCH 4/5] fix test --- tests/test_results.nim | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/test_results.nim b/tests/test_results.nim index 9637cea..9f6f90f 100644 --- a/tests/test_results.nim +++ b/tests/test_results.nim @@ -125,7 +125,7 @@ block: doAssert d.isErr # De-reference - when (NimMajor, NimMinor) >= (1, 6): + when (NimMajor, NimMinor, NimPatch) >= (1, 6, 12): {.warning[BareExcept]: off.} try: @@ -134,7 +134,7 @@ block: except: discard - when (NimMajor, NimMinor) >= (1, 6): + when (NimMajor, NimMinor, NimPatch) >= (1, 6, 12): {.warning[BareExcept]: on.} # Comparisons From 758d345830c61064fde89f1cd6d11bb68d54646e Mon Sep 17 00:00:00 2001 From: Jacek Sieka Date: Mon, 11 Mar 2024 08:44:34 +0100 Subject: [PATCH 5/5] x --- .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 0f64566..3da8008 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,7 +18,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.2","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.x","1.6.0","1.6.x","2.0.0","2.0.x","stable","devel"')) }} name: 'nim-${{matrix.branch}}' runs-on: ubuntu-latest