Merge branch 'master' into acvp-auto-testing

.github/workflows/artifact_validation.yaml

@@ -76,10 +76,12 @@ jobs:
         with: 
           name: Compatibility_acvts_csv
           path: output/
-      - name: Build compat matrix
+      - 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_cms_v1.html ./output/certs/*.log ./docs/gh-pages
+        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
       - name: Archive Compatibility Matrix For Download
         uses:  actions/upload-pages-artifact@v3
         with:

docs/gh-pages/index.html

@@ -9,6 +9,7 @@
     <br>
     <p>Test matrix generated from manually-uploaded test results:</p>
     <p><a href="pqc_hackathon_results_certs_r3.html">pqc_hackathon_results_certs_r3.html</a></p>
+    <p><a href="pqc_hackathon_results_certs_r4.html">pqc_hackathon_results_certs_r4.html</a></p>
     <p><a href="pqc_hackathon_results_cms_v1.html">pqc_hackathon_results_cms_v1.html</a></p>
     <br>
     <p>Logs from the most recent run can be found here:</p>