From fbc6ef689399c8d233a11c8ed940c63ad6d6540c Mon Sep 17 00:00:00 2001
From: Fischer Moseley <42497969+fischermoseley@users.noreply.github.com>
Date: Sat, 8 Apr 2023 15:03:07 -0400
Subject: [PATCH] consolidate CI tests

---
 .github/workflows/build_examples.yml          | 66 +++++++++++++++++++
 .github/workflows/build_icestick_examples.yml | 32 ---------
 .github/workflows/build_nexys_a7_examples.yml | 36 ----------
 3 files changed, 66 insertions(+), 68 deletions(-)
 create mode 100644 .github/workflows/build_examples.yml
 delete mode 100644 .github/workflows/build_icestick_examples.yml
 delete mode 100644 .github/workflows/build_nexys_a7_examples.yml

diff --git a/.github/workflows/build_examples.yml b/.github/workflows/build_examples.yml
new file mode 100644
index 0000000..36a6c37
--- /dev/null
+++ b/.github/workflows/build_examples.yml
@@ -0,0 +1,66 @@
+name: build_examples
+on: [push]
+jobs:
+  nexys_a7_examples:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: Add SSH Keys
+        run: |
+          mkdir ~/.ssh
+          touch ~/.ssh/id_rsa
+          chmod 600 ~/.ssh/id_rsa
+          echo "${{ secrets.LAB_BC_PRIVATE_KEY }}" > ~/.ssh/id_rsa
+          echo "${{ secrets.LAB_BC_KNOWN_HOSTS }}" > ~/.ssh/known_hosts
+
+      - name: Install Manta from Source
+        run: |
+          pip install setuptools --upgrade
+
+          # omitting the following commmand causes the version of setuptools
+          # used by python to get confused, and it doesn't detect the name
+          # or version of the package from pyproject.toml - so the following
+          # workaround is used:
+          # https://github.com/pypa/setuptools/issues/3269#issuecomment-1254507377
+          export DEB_PYTHON_INSTALL_LAYOUT=deb_system
+
+          python3 -m pip install .
+
+      - name: Build io_core
+        run: make nexys_a7_io_core
+
+      - name: Build logic_analyzer
+        run: make nexys_a7_logic_analyzer
+
+      - name: Build lut_ram
+        run: make nexys_a7_lut_ram
+
+  icestick_examples:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+
+    - name: Install Manta from Source
+      run: |
+        pip install setuptools --upgrade
+
+        # omitting the following commmand causes the version of setuptools
+        # used by python to get confused, and it doesn't detect the name
+        # or version of the package from pyproject.toml - so the following
+        # workaround is used:
+        # https://github.com/pypa/setuptools/issues/3269#issuecomment-1254507377
+        export DEB_PYTHON_INSTALL_LAYOUT=deb_system
+
+        python3 -m pip install .
+
+    - name: Install Icestorm Tools
+      run: |
+        wget --no-verbose https://github.com/YosysHQ/oss-cad-suite-build/releases/download/2023-02-23/oss-cad-suite-linux-x64-20230223.tgz
+        tar -xzf oss-cad-suite-linux-x64-20230223.tgz
+        export PATH="$(pwd)/oss-cad-suite/bin/:$PATH"
+
+    - name: Build io_core
+      run: make icestick_io_core
+
+    - name: Build lut_ram
+      run: make icestick_lut_ram
\ No newline at end of file
diff --git a/.github/workflows/build_icestick_examples.yml b/.github/workflows/build_icestick_examples.yml
deleted file mode 100644
index c0004cb..0000000
--- a/.github/workflows/build_icestick_examples.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-name: build_icestick_examples
-on: [push]
-jobs:
-  install-toolchain:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v3
-
-    - name: Install Manta from Source
-      run: |
-        pip install setuptools --upgrade
-
-        # omitting the following commmand causes the version of setuptools
-        # used by python to get confused, and it doesn't detect the name
-        # or version of the package from pyproject.toml - so the following
-        # workaround is used:
-        # https://github.com/pypa/setuptools/issues/3269#issuecomment-1254507377
-        export DEB_PYTHON_INSTALL_LAYOUT=deb_system
-
-        python3 -m pip install .
-
-    - name: Install Icestorm Tools
-      run: |
-        wget --no-verbose https://github.com/YosysHQ/oss-cad-suite-build/releases/download/2023-02-23/oss-cad-suite-linux-x64-20230223.tgz
-        tar -xzf oss-cad-suite-linux-x64-20230223.tgz
-        export PATH="$(pwd)/oss-cad-suite/bin/:$PATH"
-
-    - name: Build io_core
-      run: make icestick_io_core
-
-    - name: Build lut_ram
-      run: make icestick_lut_ram
\ No newline at end of file
diff --git a/.github/workflows/build_nexys_a7_examples.yml b/.github/workflows/build_nexys_a7_examples.yml
deleted file mode 100644
index 72f4cfa..0000000
--- a/.github/workflows/build_nexys_a7_examples.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-name: build_nexys_a7_examples
-on: [push]
-jobs:
-  counter:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - name: Add SSH Keys
-        run: |
-          mkdir ~/.ssh
-          touch ~/.ssh/id_rsa
-          chmod 600 ~/.ssh/id_rsa
-          echo "${{ secrets.LAB_BC_PRIVATE_KEY }}" > ~/.ssh/id_rsa
-          echo "${{ secrets.LAB_BC_KNOWN_HOSTS }}" > ~/.ssh/known_hosts
-
-      - name: Install Manta from Source
-        run: |
-          pip install setuptools --upgrade
-
-          # omitting the following commmand causes the version of setuptools
-          # used by python to get confused, and it doesn't detect the name
-          # or version of the package from pyproject.toml - so the following
-          # workaround is used:
-          # https://github.com/pypa/setuptools/issues/3269#issuecomment-1254507377
-          export DEB_PYTHON_INSTALL_LAYOUT=deb_system
-
-          python3 -m pip install .
-
-      - name: Build io_core
-        run: make nexys_a7_io_core
-
-      - name: Build logic_analyzer
-        run: make nexys_a7_logic_analyzer
-
-      - name: Build lut_ram
-        run: make nexys_a7_lut_ram
\ No newline at end of file