From bbf5168f133a2b211e4fe8426192bda85ff3ea31 Mon Sep 17 00:00:00 2001
From: Eric Sheppard <key2@eric.sheppard.cloud>
Date: Fri, 2 Sep 2022 22:09:16 +1000
Subject: [PATCH] consolidate no_std

---
 .github/workflows/test.yml | 37 ++++---------------------------------
 ci/github.sh               |  9 ---------
 2 files changed, 4 insertions(+), 42 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 88d776a4..e76d6008 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -64,47 +64,18 @@ jobs:
       - run: cargo hack check --feature-powerset --optional-deps serde,rkyv --skip default --skip __internal_bench --skip __doctest --skip iana-time-zone --skip pure-rust-locales
 
   no_std:
-    strategy:
-      matrix:
-        os: [macos-latest, ubuntu-latest]
-
-    runs-on: ${{ matrix.os }}
-
-    steps:
-      - uses: actions/checkout@v2
-
-      - name: Install rust with no_std toolchain
-        uses: actions-rs/toolchain@v1
-        with:
-          toolchain: stable
-          target: thumbv6m-none-eabi
-          override: true
-      - uses: Swatinem/rust-cache@v1
-
-      - name: Build no_std lib
-        run: cargo build --target thumbv6m-none-eabi --color=always
-        working-directory: ./ci/core-test
-
-  intel_sgx:
     strategy:
       matrix:
         os: [ubuntu-latest]
-
+        target: [thumbv6m-none-eabi, x86_64-fortanix-unknown-sgx]
     runs-on: ${{ matrix.os }}
-
     steps:
       - uses: actions/checkout@v2
-
-      - name: Install rust with fortanix sgx toolchain
-        uses: actions-rs/toolchain@v1
+      - uses: dtolnay/rust-toolchain@stable
         with:
-          toolchain: nightly
-          target: x86_64-fortanix-unknown-sgx
-          override: true
+          targets: ${{ matrix.target }}
       - uses: Swatinem/rust-cache@v1
-
-      - name: Build sgx lib
-        run: cargo build --target x86_64-fortanix-unknown-sgx --color=always
+      - run: cargo build --target ${{ matrix.target }} --color=always
         working-directory: ./ci/core-test
 
   wasm:
diff --git a/ci/github.sh b/ci/github.sh
index b53c1001..f5b1fe31 100755
--- a/ci/github.sh
+++ b/ci/github.sh
@@ -37,8 +37,6 @@ meaningful in the github actions feature matrix UI.
             test_wasm_unknown_no_wasmbind
         elif [[ ${WASM:-} == wasm_wasi ]]; then
             test_wasm_wasi
-        elif [[ ${CORE:-} == no_std ]]; then
-            test_core
         else
             test_regular UTC0
         fi
@@ -48,13 +46,6 @@ meaningful in the github actions feature matrix UI.
     fi
 }
 
-test_core() {
-    (
-        cd ci/core-test
-        runt cargo build --target thumbv6m-none-eabi --color=always
-    )
-}
-
 test_wasm() {
     if ! command -v node; then
         echo "node is not installed, can't run wasm-pack tests"