complement feature vector; upload artifacts

Signed-off-by: Jason Volk <jason@zemos.net>

.github/workflows/test.yml

@@ -38,6 +38,9 @@ on:
       complement:
         type: boolean
         default: true
+      complement_feat_sets:
+        type: string
+        default: '["all"]'
 
 jobs:
   unit:
@@ -73,44 +76,27 @@ jobs:
       excludes: '[{"cargo_profile": "release", "rust_toolchain": "nightly"}, {"cargo_profile": "release-debuginfo", "rust_toolchain": "nightly"}, {"cargo_profile": "test", "feat_set": "default"}]'
       includes: ${{inputs.includes}}
 
-  complement_tester:
-    if: ${{inputs.complement && contains(fromJSON(inputs.cargo_profiles), fromJSON('["test"]')[0]) && contains(fromJSON(inputs.feat_sets), fromJSON('["all"]')[0]) && contains(fromJSON(inputs.rust_toolchains), fromJSON('["nightly"]')[0])}}
-    name: Complement Tester
-    uses: ./.github/workflows/bake.yml
-    with:
-      bake_targets: '["complement-tester"]'
-      cargo_profiles: '["test"]'
-      feat_sets: '["all"]'
-      rust_toolchains: '["nightly"]'
-      sys_names: ${{inputs.sys_names}}
-      sys_versions: ${{inputs.sys_versions}}
-      rust_targets: ${{inputs.rust_targets}}
-      sys_targets: ${{inputs.sys_targets}}
-      machines: ${{inputs.machines}}
-      excludes: ${{inputs.excludes}}
-      includes: ${{inputs.includes}}
-
-  complement_testee:
-    if: ${{inputs.complement && contains(fromJSON(inputs.cargo_profiles), fromJSON('["test"]')[0]) && contains(fromJSON(inputs.feat_sets), fromJSON('["all"]')[0]) && contains(fromJSON(inputs.rust_toolchains), fromJSON('["nightly"]')[0])}}
-    name: Complement Testee
-    uses: ./.github/workflows/bake.yml
-    with:
-      bake_targets: '["complement-testee"]'
-      cargo_profiles: '["test"]'
-      feat_sets: '["all"]'
-      rust_toolchains: '["nightly"]'
-      sys_names: ${{inputs.sys_names}}
-      sys_versions: ${{inputs.sys_versions}}
-      rust_targets: ${{inputs.rust_targets}}
-      sys_targets: ${{inputs.sys_targets}}
-      machines: ${{inputs.machines}}
-      excludes: ${{inputs.excludes}}
-      includes: ${{inputs.includes}}
-
   complement:
+    if: ${{inputs.complement && contains(fromJSON(inputs.cargo_profiles), fromJSON('["test"]')[0]) && contains(fromJSON(inputs.feat_sets), fromJSON('["all"]')[0]) && contains(fromJSON(inputs.rust_toolchains), fromJSON('["nightly"]')[0])}}
+    name: Complement
+    uses: ./.github/workflows/bake.yml
+    with:
+      bake_targets: '["complement-tester", "complement-testee"]'
+      cargo_profiles: '["test"]'
+      feat_sets: ${{inputs.complement_feat_sets}}
+      rust_toolchains: '["nightly"]'
+      sys_names: ${{inputs.sys_names}}
+      sys_versions: ${{inputs.sys_versions}}
+      rust_targets: ${{inputs.rust_targets}}
+      sys_targets: ${{inputs.sys_targets}}
+      machines: ${{inputs.machines}}
+      excludes: ${{inputs.excludes}}
+      includes: ${{inputs.includes}}
+
+  compliance:
     if: ${{inputs.complement && contains(fromJSON(inputs.cargo_profiles), fromJSON('["test"]')[0]) && contains(fromJSON(inputs.feat_sets), fromJSON('["all"]')[0]) && contains(fromJSON(inputs.rust_toolchains), fromJSON('["nightly"]')[0])}}
     name: Matrix Compliance
-    needs: [complement_tester, complement_testee]
+    needs: [complement]
     runs-on: ${{matrix.machine}}
     concurrency:
       group: complement-cant-walk-and-chew-bubblegum
@@ -120,8 +106,8 @@ jobs:
       fail-fast: false
       matrix:
         cargo_profile: ${{fromJSON('["test"]')}}
+        feat_set: ${{fromJSON(inputs.complement_feat_sets)}}
         rust_toolchain: ${{fromJSON('["nightly"]')}}
-        feat_set: ${{fromJSON('["all"]')}}
         sys_name: ${{fromJSON(inputs.sys_names)}}
         sys_version: ${{fromJSON(inputs.sys_versions)}}
         rust_target: ${{fromJSON(inputs.rust_targets)}}
@@ -147,7 +133,7 @@ jobs:
       run: |
         docker/complement.sh
 
-    - name: Results
+    - name: Extract
       id: extract
       env:
         name: complement_tester__${{matrix.cargo_profile}}__${{matrix.rust_toolchain}}__${{matrix.rust_target}}__${{matrix.feat_set}}__${{matrix.sys_name}}__${{matrix.sys_version}}__${{matrix.sys_target}}
@@ -156,11 +142,15 @@ jobs:
       run: |
         cid=$(cat "$name")
         docker cp "$cid:/usr/src/complement/new_results.jsonl" tests/test_results/complement/test_results.jsonl
-        git diff --exit-code --color --color-moved
 
-    - name: Artifacts
+    - name: Upload
       id: upload
       uses: actions/upload-artifact@v4
       with:
         name: test_results.${{matrix.feat_set}}.${{matrix.sys_name}}.${{matrix.sys_target}}.jsonl
         path: ./tests/test_results/complement/test_results.jsonl
+
+    - name: Accept
+      id: accept
+      run: |
+        git diff --exit-code --color --color-moved