Skip to content

Commit

Permalink
Disable MLS++ interop on CI (openmls#1555)
Browse files Browse the repository at this point in the history
Due to a recent vcpkg failure (in turn due to a bug in CMake), this PR disables interop testing with MLS++ on CI.

Co-authored-by: raphaelrobert <raphaelrobert@users.noreply.github.com>
  • Loading branch information
kkohbrok and raphaelrobert authored Apr 9, 2024
1 parent 639349a commit 7e11185
Showing 1 changed file with 59 additions and 36 deletions.
95 changes: 59 additions & 36 deletions .github/workflows/interop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,39 +26,39 @@ jobs:

# ---------------------------------------------------------------------------------------

- name: MLS++ | Checkout
run: |
git clone https://github.com/cisco/mlspp.git
cd mlspp
git checkout 623acd0839d1117e8665b6bd52eecad1ce05438d
- name: MLS++ | Install dependencies | 1/2
uses: lukka/run-vcpkg@v11
with:
vcpkgDirectory: "${{ github.workspace }}/vcpkg"
vcpkgGitCommitId: "70992f64912b9ab0e60e915ab7421faa197524b7"
vcpkgJsonGlob: "mlspp/vcpkg.json"
runVcpkgInstall: true

- name: MLS++ | Install dependencies | 2/2
uses: lukka/run-vcpkg@v11
with:
vcpkgDirectory: "${{ github.workspace }}/vcpkg"
vcpkgGitCommitId: "70992f64912b9ab0e60e915ab7421faa197524b7"
vcpkgJsonGlob: "mlspp/cmd/interop/vcpkg.json"
runVcpkgInstall: true

- name: MLS++ | Build | 1/2
working-directory: mlspp
run: |
cmake . -DCMAKE_TOOLCHAIN_FILE=${{ github.workspace }}/vcpkg/scripts/buildsystems/vcpkg.cmake
make
- name: MLS++ | Build | 2/2
working-directory: mlspp/cmd/interop
run: |
cmake . -DCMAKE_TOOLCHAIN_FILE=${{ github.workspace }}/vcpkg/scripts/buildsystems/vcpkg.cmake
make
#- name: MLS++ | Checkout
# run: |
# git clone https://github.com/cisco/mlspp.git
# cd mlspp
# git checkout 623acd0839d1117e8665b6bd52eecad1ce05438d

#- name: MLS++ | Install dependencies | 1/2
# uses: lukka/run-vcpkg@v11
# with:
# vcpkgDirectory: "${{ github.workspace }}/vcpkg"
# vcpkgGitCommitId: "70992f64912b9ab0e60e915ab7421faa197524b7"
# vcpkgJsonGlob: "mlspp/vcpkg.json"
# runVcpkgInstall: true

#- name: MLS++ | Install dependencies | 2/2
# uses: lukka/run-vcpkg@v11
# with:
# vcpkgDirectory: "${{ github.workspace }}/vcpkg"
# vcpkgGitCommitId: "70992f64912b9ab0e60e915ab7421faa197524b7"
# vcpkgJsonGlob: "mlspp/cmd/interop/vcpkg.json"
# runVcpkgInstall: true

#- name: MLS++ | Build | 1/2
# working-directory: mlspp
# run: |
# cmake . -DCMAKE_TOOLCHAIN_FILE=${{ github.workspace }}/vcpkg/scripts/buildsystems/vcpkg.cmake
# make

#- name: MLS++ | Build | 2/2
# working-directory: mlspp/cmd/interop
# run: |
# cmake . -DCMAKE_TOOLCHAIN_FILE=${{ github.workspace }}/vcpkg/scripts/buildsystems/vcpkg.cmake
# make

# ---------------------------------------------------------------------------------------

Expand Down Expand Up @@ -89,10 +89,32 @@ jobs:
# ---------------------------------------------------------------------------------------

- name: Test interoperability
# - name: Test interoperability
# run: |
# ./target/debug/interop_client&
# ./mlspp/cmd/interop/mlspp_client -live 12345&
#
# cd mls-implementations/interop
# # TODO(#1238):
# # * Add `commit.json` as soon as group context extensions proposals are supported.
# # Note: It's also possible to remove GCE proposals by hand from `commit.json`.
# # But let's not do this in CI for now and hope that it isn't needed anymore soon.
# for scenario in {welcome_join.json,external_join.json,application.json};
# do
# echo Running configs/$scenario
# errors=$(./test-runner/test-runner -fail-fast -client localhost:50051 -client localhost:12345 -config=configs/$scenario | grep error | wc -l)
# if [ "$errors" = "0" ];
# then
# echo "Success";
# else
# echo "Failed";
# exit 1;
# fi
# done

- name: Test interoperability (OpenMLS only)
run: |
./target/debug/interop_client&
./mlspp/cmd/interop/mlspp_client -live 12345&
cd mls-implementations/interop
# TODO(#1238):
Expand All @@ -102,7 +124,7 @@ jobs:
for scenario in {welcome_join.json,external_join.json,application.json};
do
echo Running configs/$scenario
errors=$(./test-runner/test-runner -fail-fast -client localhost:50051 -client localhost:12345 -config=configs/$scenario | grep error | wc -l)
errors=$(./test-runner/test-runner -fail-fast -client localhost:50051 -config=configs/$scenario | grep error | wc -l)
if [ "$errors" = "0" ];
then
echo "Success";
Expand All @@ -111,3 +133,4 @@ jobs:
exit 1;
fi
done

0 comments on commit 7e11185

Please sign in to comment.