Merge branch 'main' into fix-tinywasm

sffc · Oct 13, 2023 · 8a0ed44 · 8a0ed44
2 parents 32bb13a + a887449
commit 8a0ed44
Show file tree

Hide file tree

Showing 23 changed files with 1,492 additions and 430 deletions.
diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
diff --git a/Makefile.toml b/Makefile.toml
@@ -98,6 +98,12 @@ description = "Run all tests for the CI 'testdata' job"
 category = "CI"
 dependencies = [
     "testdata-check",
+]
+
+[tasks.ci-job-testdata-legacy]
+description = "Run all tests for the CI 'testdata' job"
+category = "CI"
+dependencies = [
     "testdata-legacy",
     "testdata-legacy-test",
 ]
@@ -116,32 +122,46 @@ dependencies = [
     "bakeddata-check",
 ]
 
-[tasks.ci-job-ffi]
-description = "Run all tests for the CI 'ffi' job"
+[tasks.ci-job-test-c]
+description = "Run all tests for the CI 'test-c' job"
 category = "CI"
 dependencies = [
-    "test-ffi",
+    "test-c",
+    "test-c-tiny",
+    "test-cpp",
 ]
 
-[tasks.ci-job-verify-ffi]
-description = "Run all tests for the CI 'verify-ffi' job"
+[tasks.ci-job-test-js]
+description = "Run all tests for the CI 'test-js' job"
 category = "CI"
 dependencies = [
-    "verify-ffi",
+    "test-js",
+    "test-tinywasm",
 ]
 
-[tasks.ci-job-gn]
-description = "Run all tests for the CI 'gn' job"
+[tasks.ci-job-nostd]
+description = "Run all tests for the CI 'test-nostd' job"
 category = "CI"
 dependencies = [
-    "gn-run",
+    "check-nostd",
+    "check-freertos-wearos",
+]
+
+
+[tasks.ci-job-diplomat]
+description = "Run all tests for the CI 'diplomat' job"
+category = "CI"
+dependencies = [
+    "verify-diplomat-gen",
+    "verify-diplomat-coverage",
 ]
 
-[tasks.ci-job-verify-gn]
-description = "Run all tests for the CI 'verify-gn' job"
+[tasks.ci-job-gn]
+description = "Run all tests for the CI 'gn' job"
 category = "CI"
 dependencies = [
     "verify-gn-gen",
+    "gn-run",
 ]
 
 [tasks.ci-job-msrv-features-1]
@@ -188,13 +208,6 @@ dependencies = [
     "depcheck",
 ]
 
-[tasks.ci-job-wasm]
-description = "Run all tests for the CI 'wasm' job"
-category = "CI"
-dependencies = [
-    "test-cpp-emscripten",
-]
-
 [tasks.ci-job-clippy]
 description = "Run all tests for the CI 'clippy' job"
 category = "CI"
@@ -224,15 +237,16 @@ dependencies = [
 
     # Get a coffee
     "ci-job-test",
+    "ci-job-nostd",
     "ci-job-test-docs",
     "ci-job-testdata",
     "ci-job-msrv-features",
     "ci-job-full-datagen",
 
     # Needs tools other than Cargo to be installed
-    "ci-job-ffi",
-    "ci-job-wasm",
-    "ci-job-verify-ffi",
+    "ci-job-diplomat",
+    "ci-job-test-c",
+    "ci-job-test-js",
     "ci-job-gn",
 
     # benchmarking and coverage jobs not included