diff --git a/.github/test-suite/config.json.template b/.github/test-suite/config.json.template index 7a3b33c53..f85e24aee 100644 --- a/.github/test-suite/config.json.template +++ b/.github/test-suite/config.json.template @@ -11,7 +11,8 @@ "id": "sop-openpgpjs-main", "path": "__SOP_OPENPGPJS__", "env": { - "OPENPGPJS_PATH": "__OPENPGPJS_MAIN__" + "OPENPGPJS_PATH": "__OPENPGPJS_MAIN__", + "DISABLE_PROFILES: "true" } }, { diff --git a/.github/test-suite/prepare_config.sh b/.github/test-suite/prepare_config.sh index 0bf112c12..f7ff0b510 100755 --- a/.github/test-suite/prepare_config.sh +++ b/.github/test-suite/prepare_config.sh @@ -8,6 +8,6 @@ cat $CONFIG_TEMPLATE \ | sed "s@__SQOP__@${SQOP}@g" \ | sed "s@__GPGME_SOP__@${GPGME_SOP}@g" \ | sed "s@__GOSOP_V2__@${GOSOP_DIR_V2}/gosop@g" \ - | sed "s@__SOP_OPENPGPJS__@${SOP_OPENPGPJS}@g" \ + | sed "s@__SOP_OPENPGPJS__@${SOP_OPENPGPJS_V2}@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 c390e4c8e..5d8b1bcb9 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.6 + image: ghcr.io/protonmail/openpgp-interop-test-docker:v1.1.7 credentials: username: ${{ github.actor }} password: ${{ secrets.github_token }} @@ -25,7 +25,7 @@ jobs: - name: Install openpgpjs-branch run: cd openpgpjs-branch && npm install - name: Print openpgpjs-branch version - run: $SOP_OPENPGPJS version --extended + run: $SOP_OPENPGPJS_V2 version --extended env: OPENPGPJS_PATH: ${{ github.workspace }}/openpgpjs-branch # check out main branch @@ -37,7 +37,7 @@ jobs: - name: Install openpgpjs-main run: cd openpgpjs-main && npm install - name: Print openpgpjs-main version - run: $SOP_OPENPGPJS version --extended + run: $SOP_OPENPGPJS_V2 version --extended env: OPENPGPJS_PATH: ${{ github.workspace }}/openpgpjs-main # Run test suite