From a03c028e5ef5209f3bbf3f8b71ee37818628a159 Mon Sep 17 00:00:00 2001 From: Scott Wadden Date: Sun, 14 Jan 2024 20:08:14 -0400 Subject: [PATCH] Update build to Nim 2.0.2 --- .github/workflows/dist_linux.yaml | 10 ++++------ .github/workflows/dist_mac.yaml | 10 ++++------ .github/workflows/dist_win.yaml | 8 +++----- 3 files changed, 11 insertions(+), 17 deletions(-) diff --git a/.github/workflows/dist_linux.yaml b/.github/workflows/dist_linux.yaml index 260e5425..7b46c9f6 100644 --- a/.github/workflows/dist_linux.yaml +++ b/.github/workflows/dist_linux.yaml @@ -12,18 +12,16 @@ jobs: - name: Install Nim run: | cd $HOME && - curl -O https://nim-lang.org/download/nim-1.6.14-linux_x64.tar.xz && - tar xf nim-1.6.14-linux_x64.tar.xz + curl -O https://nim-lang.org/download/nim-2.0.2-linux_x64.tar.xz && + tar xf nim-2.0.2-linux_x64.tar.xz - name: Install Nim and build deps run: | sudo apt-get update sudo apt-get install build-essential scons pkg-config libx11-dev libxcursor-dev libxinerama-dev libgl1-mesa-dev libglu-dev libasound2-dev libpulse-dev libudev-dev libxi-dev libxrandr-dev - name: Update path - run: echo "$HOME/.nimble/bin:$HOME/nim-1.6.14/bin" >> $GITHUB_PATH - - name: Install Nimble 0.14.2 - run: nimble install -y nimble@0.14.2 + run: echo "$HOME/.nimble/bin:$HOME/nim-2.0.2/bin" >> $GITHUB_PATH - name: Install nimble deps - run: nimble setup + run: nimble setup -y - name: Save SHAs of submodules run: 'git submodule status > .submodules.tmp' - name: Prep dist config diff --git a/.github/workflows/dist_mac.yaml b/.github/workflows/dist_mac.yaml index ea5f04a8..4d99bc97 100644 --- a/.github/workflows/dist_mac.yaml +++ b/.github/workflows/dist_mac.yaml @@ -45,15 +45,13 @@ jobs: run: brew install nim scons yasm - name: Install nim run: | - curl -LO https://github.com/nim-lang/nightlies/releases/download/2023-06-27-version-1-6-71ba2e7f3c5815d956b1ae0341b0743242b8fec6/nim-1.6.14-macosx_x64.tar.xz - tar xzf nim-1.6.14-macosx_x64.tar.xz - echo "$(pwd)/nim-1.6.14/bin" >> $GITHUB_PATH + curl -LO https://github.com/nim-lang/nightlies/releases/download/2023-12-15-version-2-0-c4c44d10df8a14204a75c34e499def200589cb7c/nim-2.0.2-macosx_x64.tar.xz + tar xzf nim-2.0.2-macosx_x64.tar.xz + echo "$(pwd)/nim-2.0.2/bin" >> $GITHUB_PATH - name: Update path run: echo "$HOME/.nimble/bin" >> $GITHUB_PATH - - name: Install Nimble 0.14.2 - run: nimble install -y nimble@0.14.2 - name: Install nimble deps - run: nimble setup + run: nimble setup -y - name: Save SHAs of submodules run: 'git submodule status > .submodules.tmp' - name: prereq cache diff --git a/.github/workflows/dist_win.yaml b/.github/workflows/dist_win.yaml index 4114e5aa..fb447ee2 100644 --- a/.github/workflows/dist_win.yaml +++ b/.github/workflows/dist_win.yaml @@ -10,17 +10,15 @@ jobs: with: fetch-depth: 0 - name: Install Nim - run: choco install nim --version=1.6.14 + run: choco install nim --version=2.0.2 - name: Install build deps run: choco install yasm innosetup rcedit zip reshack - name: Install scons run: python -m pip install scons - name: Update path - run: echo "${HOME}/.nimble/bin;C:\tools\Nim\nim-1.6.14\bin;C:\msys64\mingw64\bin;C:\Program Files (x86)\Resource Hacker" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append - - name: Install Nimble 0.14.2 - run: nimble install -y nimble@0.14.2 + run: echo "${HOME}/.nimble/bin;C:\tools\Nim\nim-2.0.2\bin;C:\msys64\mingw64\bin;C:\Program Files (x86)\Resource Hacker" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append - name: Install nimble deps - run: nimble setup + run: nimble setup -y - name: Save SHAs of submodules run: 'git submodule status > .submodules.tmp' - name: Prep dist config