Merge branch 'main' of https://github.com/Nimaoth/Absytree

Nimaoth · Jan 4, 2024 · 310a10d · 310a10d
2 parents f1b4aef + 560b06c
commit 310a10d
Showing 1 changed file with 42 additions and 22 deletions.
diff --git 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
@@ -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 libx11-xcb-dev -y
         continue-on-error: true
 
       # linux builds
@@ -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,45 @@ 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
+      - run: git clone https://github.com/nim-lang/Nim.git
+      - run: cd Nim
+      - run: "&./build_all.bat"
+      - run: cd ..
+      - name: nimble setup
+        run: Nim/bin/nimble.exe setup
+
+      # windows builds
+      - if: always()
+        run: Nim/bin/nimble.exe buildDesktopWindows --app:gui -D:forceLogToFile
+      - if: always()
+        run: Nim/bin/nimble.exe buildAbsytreeServerWindows
+      - if: always()
+        run: Nim/bin/nimble.exe buildNimsuggestWSWindows
+
+      # create release packages
+      - run: Nim/bin/nim.exe ./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