From eac31213254319eb32542b413c319dfe8e28584b Mon Sep 17 00:00:00 2001 From: Smooth Operator Date: Thu, 18 Jan 2024 21:18:55 -0500 Subject: [PATCH 1/7] update ci --- .github/workflows/ci.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 041fb1c..0ba4ea6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -36,6 +36,8 @@ jobs: #os: ['macos-latest', 'ubuntu-latest'] os: ['ubuntu-latest'] compiler: + - name: nim + version: version-2-0 - name: nim version: version-1-6 - name: nim @@ -57,7 +59,7 @@ jobs: - if: matrix.compiler.name == 'nim' name: Setup Nim - uses: alaviss/setup-nim@0.1.1 + uses: alaviss/setup-nim@0.1.2 with: path: nim version: ${{ matrix.compiler.version }} @@ -92,7 +94,7 @@ jobs: with: path: ci/libgit2 repository: libgit2/libgit2 - ref: v1.5.0 + ref: v1.7.1 - name: Setup libgit2 shell: bash @@ -118,7 +120,7 @@ jobs: ./nimph doctor || true cat nim.cfg cd `./nimph path balls` - nim c --out:$HOME/balls --define:release balls.nim + nim c --out:$HOME/balls balls.nim cd - echo "remove nim's config.nims...?" ls -l `dirname \`which nim\``/../config/ @@ -160,7 +162,7 @@ jobs: - name: Publish docs if: > github.event_name == 'push' && github.ref == 'refs/heads/master' && - matrix.os == 'ubuntu-latest' && matrix.nim == 'version-1-6' + matrix.os == 'ubuntu-latest' && matrix.nim == 'version-2-0' uses: crazy-max/ghaction-github-pages@v1 with: build_dir: ci/docs From c3bf2b3b0dc2ca8f0ce321a5da7afe83e0249f9d Mon Sep 17 00:00:00 2001 From: Smooth Operator Date: Thu, 18 Jan 2024 21:27:11 -0500 Subject: [PATCH 2/7] whoops --- .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 0ba4ea6..cb62887 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -59,7 +59,7 @@ jobs: - if: matrix.compiler.name == 'nim' name: Setup Nim - uses: alaviss/setup-nim@0.1.2 + uses: alaviss/setup-nim@0.1.1 with: path: nim version: ${{ matrix.compiler.version }} From 8fbd24aabc34af9142aa097ac47c5787d77f53c5 Mon Sep 17 00:00:00 2001 From: Smooth Operator Date: Thu, 18 Jan 2024 21:37:48 -0500 Subject: [PATCH 3/7] go to devel instead --- .github/workflows/ci.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cb62887..3ec22c0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -37,7 +37,9 @@ jobs: os: ['ubuntu-latest'] compiler: - name: nim - version: version-2-0 + version: devel + #- name: nim + # version: version-2-0 - name: nim version: version-1-6 - name: nim From 9fe60c9b9d09764c13b5b504e1291e32b4debec7 Mon Sep 17 00:00:00 2001 From: Smooth Operator Date: Thu, 18 Jan 2024 21:47:52 -0500 Subject: [PATCH 4/7] ffs --- .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 3ec22c0..4dface0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -164,7 +164,7 @@ jobs: - name: Publish docs if: > github.event_name == 'push' && github.ref == 'refs/heads/master' && - matrix.os == 'ubuntu-latest' && matrix.nim == 'version-2-0' + matrix.os == 'ubuntu-latest' && matrix.nim == 'version-1-6' uses: crazy-max/ghaction-github-pages@v1 with: build_dir: ci/docs From c8d96a58a5165b1b5f05a71e0c97ecbc09050576 Mon Sep 17 00:00:00 2001 From: Smooth Operator Date: Fri, 19 Jan 2024 15:06:50 -0500 Subject: [PATCH 5/7] shooting in the dark --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4dface0..1ca38a3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -141,8 +141,8 @@ jobs: nim c --define:libgit2Lib="$libgit2Lib" --passC:"-I$(pwd)/libgit2/include" --define:ssl -r tests/test.nim nim c --define:libgit2Lib="$libgit2Lib" --passC:"-I$(pwd)/libgit2/include" --define:ssl --define:release -r tests/test.nim - - name: Build docs - if: ${{ matrix.docs }} == 'true' + - name: Docs + if: ${{ matrix.nim }} == 'version-1-6' shell: bash run: | cd ci @@ -161,7 +161,7 @@ jobs: # Ignore failures for older Nim cp docs/{the,}index.html || true - - name: Publish docs + - name: Pages if: > github.event_name == 'push' && github.ref == 'refs/heads/master' && matrix.os == 'ubuntu-latest' && matrix.nim == 'version-1-6' From e7b7a5a5121e0d2d0647fe6268f490fcd31792ce Mon Sep 17 00:00:00 2001 From: Smooth Operator Date: Fri, 19 Jan 2024 16:47:01 -0500 Subject: [PATCH 6/7] yikes --- .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 1ca38a3..b416044 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -142,7 +142,7 @@ jobs: nim c --define:libgit2Lib="$libgit2Lib" --passC:"-I$(pwd)/libgit2/include" --define:ssl --define:release -r tests/test.nim - name: Docs - if: ${{ matrix.nim }} == 'version-1-6' + if: matrix.compiler.version == 'version-1-6' shell: bash run: | cd ci From 0690193dd46645e44770a8160e5942c008ad7a6e Mon Sep 17 00:00:00 2001 From: Smooth Operator Date: Fri, 19 Jan 2024 17:10:16 -0500 Subject: [PATCH 7/7] kill me now --- .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 b416044..ecf751b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -164,7 +164,7 @@ jobs: - name: Pages if: > github.event_name == 'push' && github.ref == 'refs/heads/master' && - matrix.os == 'ubuntu-latest' && matrix.nim == 'version-1-6' + matrix.os == 'ubuntu-latest' && matrix.compiler.version == 'version-1-6' uses: crazy-max/ghaction-github-pages@v1 with: build_dir: ci/docs