From a363d857fb4ea6672f2b830e7d71e3d41c53d12f Mon Sep 17 00:00:00 2001 From: treeform Date: Wed, 17 Jan 2024 11:31:55 -0800 Subject: [PATCH 1/5] Use Nim 2 and Atlas --- .github/workflows/build.yml | 68 +++++++++++++++++++++++++++++++++---- bumpy.nimble | 2 +- 2 files changed, 63 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0cd9f87..1dce571 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,18 +1,74 @@ -name: Github Actions -on: [push, pull_request] +name: GitHub Actions + +on: + push: + branches: + - master + pull_request: + types: [opened, synchronize, reopened] + jobs: build: strategy: fail-fast: false matrix: os: [ubuntu-latest, windows-latest] + nim-version: ['1.2.2', '2.0.2'] runs-on: ${{ matrix.os }} steps: + - uses: actions/checkout@v3 - - uses: jiro4989/setup-nim-action@v1 with: - repo-token: ${{ secrets.GITHUB_TOKEN }} - - run: nimble test -y - - run: nimble test --gc:orc -y + path: "${{ github.event.repository.name }}" + + - name: Install Choosenim + run: | + curl -O https://nim-lang.org/choosenim/init.sh + sh init.sh -y + + - name: Add Nim to PATH (linux) + if: runner.os == 'Linux' + run: echo "/home/runner/.nimble/bin" >> $GITHUB_PATH + + - name: Add Nim to PATH (windows) + if: runner.os == 'Windows' + run: | + echo "C:\Users\runneradmin\.nimble\bin" | Out-File -Append -FilePath $env:GITHUB_PATH -Encoding utf8 + shell: pwsh + + - name: Install Atlas + run: | + git clone https://github.com/nim-lang/atlas.git + cd atlas + git checkout cbba9fa77fa837931bf3c58e20c1f8cb15a22919 + nim c src/atlas.nim + + - name: Add Atlas to PATH (linux) + if: runner.os == 'Linux' + run: mv atlas/src/atlas /home/runner/.nimble/bin + + - name: Add Atlas to PATH (windows) + if: runner.os == 'Windows' + run: mv atlas/src/atlas.exe C:\Users\runneradmin\.nimble\bin + shell: pwsh + + - name: Init Atlas + run: atlas init + + - name: Install this Commit + run: atlas use "${{ github.event.repository.name }}" + + - name: List nim.cfg + run: cat nim.cfg + + - name: Install Version + run: choosenim ${{ matrix.nim-version }} + + - name: Run tests + run: | + cd "${{ github.event.repository.name }}" + # List test files here + nim c -r tests/test.nim + diff --git a/bumpy.nimble b/bumpy.nimble index 0f8194f..3ea3c3d 100644 --- a/bumpy.nimble +++ b/bumpy.nimble @@ -6,4 +6,4 @@ license = "MIT" srcDir = "src" requires "nim >= 1.2.2" -requires "vmath >= 1.1.4" +requires "vmath >= 2.0.0" From 38dafe9813e8bafb949f11daf8981977c9669fe6 Mon Sep 17 00:00:00 2001 From: treeform Date: Wed, 17 Jan 2024 11:33:51 -0800 Subject: [PATCH 2/5] f --- .github/workflows/build.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1dce571..a2c490b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -58,7 +58,7 @@ jobs: run: atlas init - name: Install this Commit - run: atlas use "${{ github.event.repository.name }}" + run: atlas use ${{ github.event.repository.name }}/${{ github.event.repository.name }}.nimble - name: List nim.cfg run: cat nim.cfg @@ -71,4 +71,3 @@ jobs: cd "${{ github.event.repository.name }}" # List test files here nim c -r tests/test.nim - From 8ae93486aca2355f51a4bdd2b54be3b244335bf7 Mon Sep 17 00:00:00 2001 From: treeform Date: Wed, 17 Jan 2024 11:39:16 -0800 Subject: [PATCH 3/5] f --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a2c490b..ac6ceb1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -49,7 +49,7 @@ jobs: if: runner.os == 'Linux' run: mv atlas/src/atlas /home/runner/.nimble/bin - - name: Add Atlas to PATH (windows) + - name: Add Atlas to PATH (windows) if: runner.os == 'Windows' run: mv atlas/src/atlas.exe C:\Users\runneradmin\.nimble\bin shell: pwsh @@ -58,7 +58,7 @@ jobs: run: atlas init - name: Install this Commit - run: atlas use ${{ github.event.repository.name }}/${{ github.event.repository.name }}.nimble + run: atlas use file://${{ github.event.repository.name }}/${{ github.event.repository.name }}.nimble - name: List nim.cfg run: cat nim.cfg From eb0d6c92abba3afc8e9dcf4edb91b7e9fd8e0885 Mon Sep 17 00:00:00 2001 From: treeform Date: Wed, 17 Jan 2024 11:40:47 -0800 Subject: [PATCH 4/5] f --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ac6ceb1..89e3c38 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -58,7 +58,7 @@ jobs: run: atlas init - name: Install this Commit - run: atlas use file://${{ github.event.repository.name }}/${{ github.event.repository.name }}.nimble + run: atlas use file://${{ github.event.repository.name }} - name: List nim.cfg run: cat nim.cfg From 04ef795ec82bf146a4c8354c403826f6460c9099 Mon Sep 17 00:00:00 2001 From: treeform Date: Wed, 17 Jan 2024 11:43:53 -0800 Subject: [PATCH 5/5] f --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 89e3c38..50afdfc 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -70,4 +70,5 @@ jobs: run: | cd "${{ github.event.repository.name }}" # List test files here + nim c -r tests/test.nim