From aba61efa702eef0c6800bec5eccdea2c67d13035 Mon Sep 17 00:00:00 2001
From: larabr <7375870+larabr@users.noreply.github.com>
Date: Thu, 21 Mar 2024 14:09:23 +0100
Subject: [PATCH] CI: update interop test suite: fix sop-openpgpjs, include
 crypto-refresh tests, and compare with gopenpgp v3

sop-openpgpjs did not correctly apply the `OPENPGPJS_PATH` env variable; as a result,
it did not actually test the code from either the PR and base branch, but always from
the hardcoded version bundled with it.
---
 .github/test-suite/config.json.template | 3 ++-
 .github/test-suite/prepare_config.sh    | 2 +-
 .github/workflows/sop-test-suite.yml    | 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/.github/test-suite/config.json.template b/.github/test-suite/config.json.template
index 7dd7e3fb..7a3b33c5 100644
--- a/.github/test-suite/config.json.template
+++ b/.github/test-suite/config.json.template
@@ -21,7 +21,8 @@
         "path": "__GPGME_SOP__"
       },
       {
-        "path": "__GOSOP__"
+        "id": "gosop-v2",
+        "path": "__GOSOP_V2__"
       },
       {
         "path": "__RNP_SOP__"
diff --git a/.github/test-suite/prepare_config.sh b/.github/test-suite/prepare_config.sh
index debe9add..0bf112c1 100755
--- a/.github/test-suite/prepare_config.sh
+++ b/.github/test-suite/prepare_config.sh
@@ -7,7 +7,7 @@ cat $CONFIG_TEMPLATE \
     | sed "s@__OPENPGPJS_MAIN__@${OPENPGPJS_MAIN}@g" \
     | sed "s@__SQOP__@${SQOP}@g" \
     | sed "s@__GPGME_SOP__@${GPGME_SOP}@g" \
-    | sed "s@__GOSOP__@${GOSOP}@g" \
+    | sed "s@__GOSOP_V2__@${GOSOP_DIR_V2}/gosop@g" \
     | sed "s@__SOP_OPENPGPJS__@${SOP_OPENPGPJS}@g" \
     | sed "s@__RNP_SOP__@${RNP_SOP}@g" \
     > $CONFIG_OUTPUT
\ No newline at end of file
diff --git a/.github/workflows/sop-test-suite.yml b/.github/workflows/sop-test-suite.yml
index bd336dbf..458a7046 100644
--- a/.github/workflows/sop-test-suite.yml
+++ b/.github/workflows/sop-test-suite.yml
@@ -10,7 +10,7 @@ jobs:
     name: Run interoperability test suite
     runs-on: ubuntu-latest
     container: 
-      image: ghcr.io/protonmail/openpgp-interop-test-docker:v1.1.1
+      image: ghcr.io/protonmail/openpgp-interop-test-docker:v1.1.6
       credentials:
         username: ${{ github.actor }}
         password: ${{ secrets.github_token }}
@@ -79,7 +79,7 @@ jobs:
         with:
           name: test-suite-results.json
       - name: Compare with baseline
-        uses: ProtonMail/openpgp-interop-test-analyzer@v1
+        uses: ProtonMail/openpgp-interop-test-analyzer@v2
         with: 
           results: ${{ steps.download-test-results.outputs.download-path }}/test-suite-results.json
           output: baseline-comparison.json