Merge branch 'fix-ci-and-toolchain-again' into 8-add-start-to-test-suite

jabacat · Oct 4, 2023 · f09d0d8 · f09d0d8
2 parents 9982c80 + 2f6fe52
commit f09d0d8
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 3 deletions.
diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
@@ -17,6 +17,14 @@ jobs:
 
       - name: Setup Dependencies
         run: python3 -m pip install meson~=1.2.2 ninja~=1.11.1
+
+      - name: Cache Dependencies
+        uses: actions/cache@v3
+        with:
+          key: linux-${{ hashFiles('subprojects/*.wrap') }}
+          path: |
+            subprojects
+            build/subprojects
 
       - name: Setup build with Meson
         run: meson setup build
@@ -37,6 +45,14 @@ jobs:
       - name: Setup Dependencies
         run: python3 -m pip install meson~=1.2.2 ninja~=1.11.1
 
+      - name: Cache Dependencies
+        uses: actions/cache@v3
+        with:
+          key: macos-${{ hashFiles('subprojects/*.wrap') }}
+          path: |
+            subprojects
+            build/subprojects
+
       - name: Setup build with Meson
         run: meson setup build
 
@@ -46,10 +62,14 @@ jobs:
       - name: Test with Meson
         run: meson test -C build
 
-  windows-random:
-    name: Build and Test on Windows (Ninja and random compiler)
+  windows-mingw:
+    name: Build and Test on Windows (MinGW)
     runs-on: windows-latest
 
+    defaults:
+      run:
+        shell: bash
+
     steps:
       - uses: actions/checkout@v2
 
@@ -75,6 +95,14 @@ jobs:
       - name: Setup Dependencies
         run: python -m pip install meson~=1.2.2 ninja~=1.11.1
 
+      - name: Cache Dependencies
+        uses: actions/cache@v3
+        with:
+          key: windows-${{ hashFiles('subprojects/*.wrap') }}
+          path: |
+            subprojects
+            build/subprojects
+
       - name: Setup build with Meson
         run: meson setup -Dvsenv=true build
 

diff --git a/README.md b/README.md
@@ -4,6 +4,7 @@ JABACAT-created machine learning library from scratch.
 ## Build
 > [!IMPORTANT]
 > This project uses [The Meson Build system](https://mesonbuild.com/index.html). Follow instructions posted on the website to [install meson](https://mesonbuild.com/SimpleStart.html). On Windows, there is a winget package available.
+
 To build, setup the build directory. Any configuration steps should be done now (specifying compiler or linker, etc.).
 ```bash
 meson setup build   # replace `build` with any arbitrary output build directory
@@ -25,4 +26,3 @@ Run `meson test` to test the project.
 ```bash
 meson test -C build     # replace `build`
 ```
-