Merge pull request #5761 from YosysHQ/fix_ci

Check results properly

.github/workflows/extra-builds.yml

@@ -138,6 +138,14 @@ jobs:
       - vs-build
       - wasi-build
       - nix-build
-    if: always() && !contains(join(needs.*.result, ','), 'failure') && !contains(join(needs.*.result, ','), 'cancelled')
+    if: always()
     steps:
-      - run: echo "All good"
+      - name: Check results
+        run: |
+          echo "Needs results: ${{ join(needs.*.result, ',') }}"
+          if [[ "${{ join(needs.*.result, ',') }}" == *failure* ]] || \
+            [[ "${{ join(needs.*.result, ',') }}" == *cancelled* ]]; then
+            echo "Some jobs failed or were cancelled"
+            exit 1
+          fi
+      - run: echo "All good"

.github/workflows/test-build.yml

@@ -287,6 +287,14 @@ jobs:
       - test-cells
       - test-docs
       - test-docs-build
-    if: always() && !contains(join(needs.*.result, ','), 'failure') && !contains(join(needs.*.result, ','), 'cancelled')
+    if: always()
     steps:
-      - run: echo "All good"
+      - name: Check results
+        run: |
+          echo "Needs results: ${{ join(needs.*.result, ',') }}"
+          if [[ "${{ join(needs.*.result, ',') }}" == *failure* ]] || \
+            [[ "${{ join(needs.*.result, ',') }}" == *cancelled* ]]; then
+            echo "Some jobs failed or were cancelled"
+            exit 1
+          fi
+      - run: echo "All good"

.github/workflows/test-compile.yml

@@ -100,6 +100,14 @@ jobs:
     runs-on: ubuntu-latest
     needs:
       - test-compile
-    if: always() && !contains(join(needs.*.result, ','), 'failure') && !contains(join(needs.*.result, ','), 'cancelled')
+    if: always()
     steps:
+      - name: Check results
+        run: |
+          echo "Needs results: ${{ join(needs.*.result, ',') }}"
+          if [[ "${{ join(needs.*.result, ',') }}" == *failure* ]] || \
+            [[ "${{ join(needs.*.result, ',') }}" == *cancelled* ]]; then
+            echo "Some jobs failed or were cancelled"
+            exit 1
+          fi
       - run: echo "All good"

.github/workflows/test-sanitizers.yml

@@ -86,6 +86,14 @@ jobs:
     runs-on: ubuntu-latest
     needs:
       - run_san
-    if: always() && !contains(join(needs.*.result, ','), 'failure') && !contains(join(needs.*.result, ','), 'cancelled')
+    if: always()
     steps:
-      - run: echo "All good"
+      - name: Check results
+        run: |
+          echo "Needs results: ${{ join(needs.*.result, ',') }}"
+          if [[ "${{ join(needs.*.result, ',') }}" == *failure* ]] || \
+            [[ "${{ join(needs.*.result, ',') }}" == *cancelled* ]]; then
+            echo "Some jobs failed or were cancelled"
+            exit 1
+          fi
+      - run: echo "All good"

.github/workflows/test-verific.yml

@@ -129,6 +129,14 @@ jobs:
     needs:
       - test-verific
       - test-pyosys
-    if: always() && !contains(join(needs.*.result, ','), 'failure') && !contains(join(needs.*.result, ','), 'cancelled')
+    if: always()
     steps:
+      - name: Check results
+        run: |
+          echo "Needs results: ${{ join(needs.*.result, ',') }}"
+          if [[ "${{ join(needs.*.result, ',') }}" == *failure* ]] || \
+            [[ "${{ join(needs.*.result, ',') }}" == *cancelled* ]]; then
+            echo "Some jobs failed or were cancelled"
+            exit 1
+          fi
       - run: echo "All good"

techlibs/common/synth.cc

@@ -326,13 +326,13 @@ struct SynthPass : public ScriptPass {
 			if ((!noabc && !flowmap) || help_mode) {
 #ifdef YOSYS_ENABLE_ABC
 				if (help_mode) {
-					run(abc + " -fast", "       (unless -noabc, unless -lut)");
-					run(abc + " -fast -lut k", "(unless -noabc, if -lut)");
+					run(abc, "       (unless -noabc, unless -lut)");
+					run(abc + " -lut k", "(unless -noabc, if -lut)");
 				} else {
 					if (lut)
-						run(stringf("%s -fast -lut %d", abc, lut));
+						run(stringf("%s -lut %d", abc, lut));
 					else
-						run(abc + " -fast");
+						run(abc);
 				}
 				run("opt -fast", "       (unless -noabc)");
 #endif

tests/techmap/abc9.ys

@@ -17,7 +17,8 @@ design -save gold
 abc9 -lut 4
 
 design -load gold
-abc9 -lut 4 -fast
+scratchpad -copy abc9.script.default.fast abc9.script
+abc9 -lut 4
 
 design -load gold
 scratchpad -copy abc9.script.default.area abc9.script