From a4bca91dda115c6bd6f7a4653e0685a63e169115 Mon Sep 17 00:00:00 2001
From: Niklas Dewally <nd60@st-andrews.ac.uk>
Date: Fri, 3 Nov 2023 18:35:08 +0000
Subject: [PATCH] CI: build and test for Conjure Oxide

---
 .github/workflows/minion.yml |   2 +-
 .github/workflows/oxide.yml  | 111 +++++++++++++++++++++++++++++++++++
 2 files changed, 112 insertions(+), 1 deletion(-)
 create mode 100644 .github/workflows/oxide.yml

diff --git a/.github/workflows/minion.yml b/.github/workflows/minion.yml
index b84894d956..0fa56f635f 100644
--- a/.github/workflows/minion.yml
+++ b/.github/workflows/minion.yml
@@ -107,7 +107,7 @@ jobs:
         run: rustup update stable && rustup default stable
 
       - working-directory: ./solvers/minion
-        run: cargo test -- --test-threads=1
+        run: cargo test
 
 
       
diff --git a/.github/workflows/oxide.yml b/.github/workflows/oxide.yml
new file mode 100644
index 0000000000..b8e4aa9fa4
--- /dev/null
+++ b/.github/workflows/oxide.yml
@@ -0,0 +1,111 @@
+name: "conjure-oxide"
+on:
+  push:
+    paths: 
+      - 'src/**'
+      - "Cargo.*"
+  pull_request:
+    paths: 
+      - 'src/**'
+      - "Cargo.*"
+  workflow_dispatch:
+
+jobs:
+  ubuntu:
+    name: "Conjure Oxide: Ubuntu Build"
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Generate caching variables
+        id: cache-vars
+        run: |
+          echo -e "submodule_sha=$(./etc/ci/get_submodules_hash.sh)" >> "$GITHUB_OUTPUT"
+          echo -e "submodule_sha=$(./etc/ci/get_submodules_hash.sh)"
+
+      - name: Set up cache
+        uses: actions/cache@v3
+        with:
+          path: 
+            ~/.cargo/bin/
+            ~/.cargo/registry/index/
+            ~/.cargo/registry/cache/
+            ~/.cargo/git/db/
+            target/            
+            solvers/minion/vendor
+            solvers/chuffed/vendor
+
+          key: stable-${{ runner.os }}-gitmodules-${{ steps.cache-vars.outputs.submodule_sha }}-cargo-${{ hashFiles('**/Cargo.lock') }}
+          restore-keys: stable-${{ runner.os }}-gitmodules-
+
+      - run: rustup update stable && rustup default stable
+
+      - run: cargo build -vv
+
+  mac:
+    name: "Conjure Oxide: Mac Build"
+    runs-on: macos-latest
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Generate caching variables
+        id: cache-vars
+        run: |
+          echo -e "submodule_sha=$(./etc/ci/get_submodules_hash.sh)" >> "$GITHUB_OUTPUT"
+          echo -e "submodule_sha=$(./etc/ci/get_submodules_hash.sh)"
+
+      - name: Set up cache
+        uses: actions/cache@v3
+        with:
+          path: 
+            ~/.cargo/bin/
+            ~/.cargo/registry/index/
+            ~/.cargo/registry/cache/
+            ~/.cargo/git/db/
+            target/            
+            solvers/minion/vendor
+            solvers/chuffed/vendor
+            
+          key: stable-${{ runner.os }}-gitmodules-${{ steps.cache-vars.outputs.submodule_sha }}-cargo-${{ hashFiles('**/Cargo.lock') }}
+          restore-keys: stable-${{ runner.os }}-gitmodules-
+
+      - run: rustup update stable && rustup default stable
+
+      - run: rustup target add aarch64-apple-darwin
+
+      - run: cargo build -vv
+
+  tests:
+    name: "Conjure Oxide: Tests"
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Generate caching variables
+        id: cache-vars
+        run: |
+          echo -e "submodule_sha=$(./etc/ci/get_submodules_hash.sh)" >> "$GITHUB_OUTPUT"
+          echo -e "submodule_sha=$(./etc/ci/get_submodules_hash.sh)"
+
+      - name: Set up cache
+        uses: actions/cache@v3
+        with:
+          path: 
+            ~/.cargo/bin/
+            ~/.cargo/registry/index/
+            ~/.cargo/registry/cache/
+            ~/.cargo/git/db/
+            target/            
+            solvers/minion/vendor
+            solvers/chuffed/vendor
+          key: stable-${{ runner.os }}-gitmodules-${{ steps.cache-vars.outputs.submodule_sha }}-cargo-${{ hashFiles('**/Cargo.lock') }}
+          restore-keys: stable-${{ runner.os }}-gitmodules-
+
+      - run: rustup update stable && rustup default stable
+
+      - run: cargo test
+
+
+      
+
+