Merge branch 'develop' into release-0.6.8

# Conflicts: # .github/workflows/test.yaml
QuTech-Delft · Oct 16, 2024 · 8cb66ee · 8cb66ee
2 parents 9e39645 + b487a0a
commit 8cb66ee
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 11 deletions.
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -59,8 +59,8 @@ jobs:
     needs: cpp-linters
     runs-on: [self-hosted, ARM64, Linux]
     container: python:3.11
-    # Run only on master (until we have a GitHub-hosted runner for Linux/ARM64)
-    if: github.ref == 'refs/heads/master'
+    # Run only when merging to develop (until we have a GitHub-hosted runner for Linux/ARM64)
+    if: github.ref == 'refs/heads/develop'
     strategy:
       fail-fast: false
       matrix:
@@ -322,6 +322,15 @@ jobs:
           ${{
                contains(needs.*.result, 'failure')
             || contains(needs.*.result, 'cancelled')
-            || contains(needs.*.result, 'skipped')
+            || (
+                    github.ref != 'refs/heads/develop'
+                 && contains(needs.*.result, 'skipped')
+                 && !contains(needs.cpp-linux-arm64.result, 'skipped')
+               )
+            ||
+               (
+                    github.ref == 'refs/heads/develop'
+                 && contains(needs.*.result, 'skipped')
+               )
           }}
         run: exit 1
diff --git a/src/v3x/instruction_set.cpp b/src/v3x/instruction_set.cpp
@@ -16,14 +16,14 @@ InstructionSet::InstructionSet()
     { "CR", { 'f', "QV" } },
     { "CR", { 'f', "VQ" } },
     { "CR", { 'f', "VV" } },
-    { "CRk", { std::nullopt, "QQ" } },
-    { "CRk", { std::nullopt, "QV" } },
-    { "CRk", { std::nullopt, "VQ" } },
-    { "CRk", { std::nullopt, "VV" } },
-    { "CZ", { 'i', "QQ" } },
-    { "CZ", { 'i', "QV" } },
-    { "CZ", { 'i', "VQ" } },
-    { "CZ", { 'i', "VV" } },
+    { "CRk", { 'i', "QQ" } },
+    { "CRk", { 'i', "QV" } },
+    { "CRk", { 'i', "VQ" } },
+    { "CRk", { 'i', "VV" } },
+    { "CZ", { std::nullopt, "QQ" } },
+    { "CZ", { std::nullopt, "QV" } },
+    { "CZ", { std::nullopt, "VQ" } },
+    { "CZ", { std::nullopt, "VV" } },
     { "H", { std::nullopt, "Q" } },
     { "H", { std::nullopt, "V" } },
     { "I", { std::nullopt, "Q" } },