From a5910eb237057e1a07e78f87793216b3d3f7c407 Mon Sep 17 00:00:00 2001
From: Mike Ounsworth <mike@ounsworth.ca>
Date: Sun, 3 Nov 2024 03:46:33 +1000
Subject: [PATCH] mikeo r4 automation

---
 .github/workflows/artifact_validation.yaml | 4 +---
 src/pqc_report_writer_common.py            | 4 ++--
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/artifact_validation.yaml b/.github/workflows/artifact_validation.yaml
index c12c7e55..459c4c55 100644
--- a/.github/workflows/artifact_validation.yaml
+++ b/.github/workflows/artifact_validation.yaml
@@ -64,12 +64,10 @@ jobs:
         with: 
           name: Compatibility_bc_csv
           path: output/
-      - name: Build compat matrix (r3)
-        run: ./src/rebuild_results_certs_r3.sh
       - name: Build compat matrix (r4)
         run: ./src/rebuild_results_certs_r4.sh
       - name: Copy output files
-        run: mv ./docs/pqc_hackathon_results_certs_r3.html ./docs/pqc_hackathon_results_certs_r3_automated_tests.html ./docs/pqc_hackathon_results_certs_r4.html ./docs/pqc_hackathon_results_cms_v1.html ./output/certs/oqs_certs.log ./output/certs/bc_certs.log ./docs/gh-pages
+        run: mv ./docs/pqc_hackathon_results_certs_r4.html ./docs/pqc_hackathon_results_certs_r4_automated_tests.html ./docs/pqc_hackathon_results_cms_v1.html ./output/certs/oqs_certs.log ./output/certs/bc_certs.log ./docs/gh-pages
       - name: Archive Compatibility Matrix For Download
         uses:  actions/upload-pages-artifact@v3
         with:
diff --git a/src/pqc_report_writer_common.py b/src/pqc_report_writer_common.py
index 9ff185f2..e64ff048 100644
--- a/src/pqc_report_writer_common.py
+++ b/src/pqc_report_writer_common.py
@@ -46,10 +46,10 @@ def passedAllVerifiers(generator, oid, algorithmVerificationResults) -> int:
     relevant_avrs = [algorithmVerificationResult for algorithmVerificationResult in algorithmVerificationResults if algorithmVerificationResult.generator == generator and algorithmVerificationResult.key_algorithm_oid == oid]
     
     for algorithmVerificationResult in relevant_avrs:
-        if algorithmVerificationResult.test_result is None or algorithmVerificationResult.test_result is '':
+        if algorithmVerificationResult.test_result == None or algorithmVerificationResult.test_result is '':
             continue
 
-        if algorithmVerificationResult.test_result is 'Y':
+        if algorithmVerificationResult.test_result == 'Y':
             passedOne = True
         else:
             failedOne = True