From 2c966030dcb8b38926cfd9b5bf3849cdee2c6dd7 Mon Sep 17 00:00:00 2001 From: Nicolas Otremba Date: Thu, 4 Jan 2024 17:07:23 +0100 Subject: [PATCH 01/11] Update main.yml --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 94ade6af..1a91817f 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -39,7 +39,7 @@ jobs: - run: apt-get update continue-on-error: true - - run: apt-get install gcc-mingw-w64 -y + - run: apt-get install gcc-mingw-w64 xcb -y continue-on-error: true # linux builds From 0e2917e39ba0bdd753d750544bbe3014e7b44986 Mon Sep 17 00:00:00 2001 From: Nicolas Otremba Date: Thu, 4 Jan 2024 17:11:37 +0100 Subject: [PATCH 02/11] Update main.yml --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 1a91817f..b3e44e31 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -39,7 +39,7 @@ jobs: - run: apt-get update continue-on-error: true - - run: apt-get install gcc-mingw-w64 xcb -y + - run: apt-get install gcc-mingw-w64 libx11-xcb-dev -y continue-on-error: true # linux builds From 882ff9d14774b5e9bc1778f073c50f545e63e490 Mon Sep 17 00:00:00 2001 From: Nicolas Otremba Date: Thu, 4 Jan 2024 17:37:28 +0100 Subject: [PATCH 03/11] Update main.yml --- .github/workflows/main.yml | 61 +++++++++++++++++++++++++------------- 1 file changed, 40 insertions(+), 21 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index b3e44e31..89367541 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -22,8 +22,8 @@ concurrency: cancel-in-progress: true jobs: - build-absytree: - name: Build Absytree + build-absytree-linux: + name: Build Absytree Linux runs-on: ubuntu-latest container: image: nimlang/nim:2.0.0-regular @@ -51,26 +51,12 @@ jobs: - if: always() run: nimble buildDesktop --app:gui -D:forceLogToFile - # windows builds - - if: always() - run: nimble buildDesktopWindows --app:gui -D:forceLogToFile - - if: always() - run: nimble buildAbsytreeServerWindows - - if: always() - run: nimble buildNimsuggestWSWindows - # create release packages - run: nim ./tools/package_release.nims - - run: ls -la release_windows - run: ls -la release_linux - run: ls -la release_web # make zips - - name: Zip release_windows - uses: vimtor/action-zip@v1 - with: - files: release_windows - dest: release_windows.zip - name: Zip release_linux uses: vimtor/action-zip@v1 with: @@ -83,11 +69,6 @@ jobs: dest: release_web.zip # upload artifacts - - name: Upload release_windows - uses: actions/upload-artifact@v3 - with: - name: release_windows - path: release_windows.zip - name: Upload release_linux uses: actions/upload-artifact@v3 with: @@ -99,6 +80,44 @@ jobs: name: release_web path: release_web.zip + build-absytree-windows: + name: Build Absytree Windows + runs-on: windows-2022 + steps: + - name: Checkout the repo + uses: actions/checkout@v3 + - name: add Absytree as git safe.directory so nimble can install stuff + run: git config --global --add safe.directory /__w/Absytree/Absytree + - run: ls -la + - name: nimble setup + run: PATH=/github/home/.nimble/bin:$PATH nimble setup + + # windows builds + - if: always() + run: nimble buildDesktopWindows --app:gui -D:forceLogToFile + - if: always() + run: nimble buildAbsytreeServerWindows + - if: always() + run: nimble buildNimsuggestWSWindows + + # create release packages + - run: nim ./tools/package_release.nims + - run: ls -la release_windows + + # make zips + - name: Zip release_windows + uses: vimtor/action-zip@v1 + with: + files: release_windows + dest: release_windows.zip + + # upload artifacts + - name: Upload release_windows + uses: actions/upload-artifact@v3 + with: + name: release_windows + path: release_windows.zip + run-tests: name: Run tests runs-on: ubuntu-latest From 22c675f56172331d2645a7c325709858a8076539 Mon Sep 17 00:00:00 2001 From: Nicolas Otremba Date: Thu, 4 Jan 2024 17:38:40 +0100 Subject: [PATCH 04/11] Update main.yml --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 89367541..95d84ab9 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -88,7 +88,7 @@ jobs: uses: actions/checkout@v3 - name: add Absytree as git safe.directory so nimble can install stuff run: git config --global --add safe.directory /__w/Absytree/Absytree - - run: ls -la + - run: ls - name: nimble setup run: PATH=/github/home/.nimble/bin:$PATH nimble setup From 8658239159dd78def38dc0b4677a9f740b84798a Mon Sep 17 00:00:00 2001 From: Nicolas Otremba Date: Thu, 4 Jan 2024 17:40:41 +0100 Subject: [PATCH 05/11] Update main.yml --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 95d84ab9..0b149d16 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -90,7 +90,7 @@ jobs: run: git config --global --add safe.directory /__w/Absytree/Absytree - run: ls - name: nimble setup - run: PATH=/github/home/.nimble/bin:$PATH nimble setup + run: nimble setup # windows builds - if: always() From 214bb3928df0fca2f14c3864c409b920793de0cf Mon Sep 17 00:00:00 2001 From: Nicolas Otremba Date: Thu, 4 Jan 2024 17:56:11 +0100 Subject: [PATCH 06/11] Update main.yml --- .github/workflows/main.yml | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 0b149d16..0c5dc96f 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -86,22 +86,21 @@ jobs: steps: - name: Checkout the repo uses: actions/checkout@v3 - - name: add Absytree as git safe.directory so nimble can install stuff - run: git config --global --add safe.directory /__w/Absytree/Absytree - - run: ls + - run: git status + - run: tools/install-nim.ps1 - name: nimble setup - run: nimble setup + run: nim/bin/nimble.exe setup # windows builds - if: always() - run: nimble buildDesktopWindows --app:gui -D:forceLogToFile + run: nim/bin/nimble.exe buildDesktopWindows --app:gui -D:forceLogToFile - if: always() - run: nimble buildAbsytreeServerWindows + run: nim/bin/nimble.exe buildAbsytreeServerWindows - if: always() - run: nimble buildNimsuggestWSWindows + run: nim/bin/nimble.exe buildNimsuggestWSWindows # create release packages - - run: nim ./tools/package_release.nims + - run: nim/bin/nim.exe ./tools/package_release.nims - run: ls -la release_windows # make zips From ad3aba09cce680436810ddc3d8c4741577a00426 Mon Sep 17 00:00:00 2001 From: Nicolas Otremba Date: Thu, 4 Jan 2024 18:00:10 +0100 Subject: [PATCH 07/11] Update main.yml --- .github/workflows/main.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 0c5dc96f..10b04d47 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -86,21 +86,21 @@ jobs: steps: - name: Checkout the repo uses: actions/checkout@v3 - - run: git status - - run: tools/install-nim.ps1 + - run: git clone https://github.com/nim-lang/Nim.git + - run: Nim/build_all.bat - name: nimble setup - run: nim/bin/nimble.exe setup + run: Nim/bin/nimble.exe setup # windows builds - if: always() - run: nim/bin/nimble.exe buildDesktopWindows --app:gui -D:forceLogToFile + run: Nim/bin/nimble.exe buildDesktopWindows --app:gui -D:forceLogToFile - if: always() - run: nim/bin/nimble.exe buildAbsytreeServerWindows + run: Nim/bin/nimble.exe buildAbsytreeServerWindows - if: always() - run: nim/bin/nimble.exe buildNimsuggestWSWindows + run: Nim/bin/nimble.exe buildNimsuggestWSWindows # create release packages - - run: nim/bin/nim.exe ./tools/package_release.nims + - run: Nim/bin/nim.exe ./tools/package_release.nims - run: ls -la release_windows # make zips From 0fdab84a780eb5c11a8220a606744db016b4a0d4 Mon Sep 17 00:00:00 2001 From: Nicolas Otremba Date: Thu, 4 Jan 2024 18:04:26 +0100 Subject: [PATCH 08/11] Update main.yml --- .github/workflows/main.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 10b04d47..7b1f81c0 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -87,7 +87,9 @@ jobs: - name: Checkout the repo uses: actions/checkout@v3 - run: git clone https://github.com/nim-lang/Nim.git + - run: cd Nim - run: Nim/build_all.bat + - run: cd .. - name: nimble setup run: Nim/bin/nimble.exe setup From fc37d646d17c7ce603943dacdee01ba59252d9f3 Mon Sep 17 00:00:00 2001 From: Nicolas Otremba Date: Thu, 4 Jan 2024 18:08:29 +0100 Subject: [PATCH 09/11] Update main.yml --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 7b1f81c0..5f999c39 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -88,7 +88,7 @@ jobs: uses: actions/checkout@v3 - run: git clone https://github.com/nim-lang/Nim.git - run: cd Nim - - run: Nim/build_all.bat + - run: build_all.bat - run: cd .. - name: nimble setup run: Nim/bin/nimble.exe setup From db31c51df96507cd5471bbb9276f793d5f74a282 Mon Sep 17 00:00:00 2001 From: Nicolas Otremba Date: Thu, 4 Jan 2024 18:11:26 +0100 Subject: [PATCH 10/11] Update main.yml --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 5f999c39..6b692a5e 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -88,7 +88,7 @@ jobs: uses: actions/checkout@v3 - run: git clone https://github.com/nim-lang/Nim.git - run: cd Nim - - run: build_all.bat + - run: &./build_all.bat - run: cd .. - name: nimble setup run: Nim/bin/nimble.exe setup From 560b06c5f1e1564a0c8ece08328d3bd9879489b5 Mon Sep 17 00:00:00 2001 From: Nicolas Otremba Date: Thu, 4 Jan 2024 18:11:51 +0100 Subject: [PATCH 11/11] Update main.yml --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 6b692a5e..d9aa2784 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -88,7 +88,7 @@ jobs: uses: actions/checkout@v3 - run: git clone https://github.com/nim-lang/Nim.git - run: cd Nim - - run: &./build_all.bat + - run: "&./build_all.bat" - run: cd .. - name: nimble setup run: Nim/bin/nimble.exe setup