Update rlgl usage (switch from player ID to labels)

2 files changed, 17 insertions, 24 deletions

diff --git a/.ci/build.sh b/.ci/build.sh
index 7b21ec1..0096288 100755
--- a/.ci/build.sh
+++ b/.ci/build.sh
@@ -17,20 +17,6 @@ fi
 
 export DOCKER=docker
 
-function build_cfarm()
-{
-    curl -u ${CFARM_AUTH} https://cfarm-test-libffi-libffi.apps.home.labdroid.net/test?host=${HOST}\&commit=${TRAVIS_COMMIT} | tee build.log
-    echo :::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-    echo $(tail build.log | grep '^==LOGFILE==')
-    echo $(tail build.log | grep '^==LOGFILE==' | cut -b13-)
-    echo :::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-    curl -u ${CFARM_AUTH} "$(tail build.log | grep '^==LOGFILE==' | cut -b13-)" > libffi.log
-
-    ./rlgl l --key=${RLGL_KEY} https://rl.gl
-    ./rlgl e --id=${GITHUB_SHA:0:7} -l project=libffi -l sha=${GITHUB_SHA:0:7} -l CC=${{ matrix.CFARM_CC }} -l host=${{ matrix.CFARM_TRIPLE }} --policy=https://github.com/libffi/rlgl-policy.git libffi.log
-    exit $?
-}
-
 function build_linux()
 {
     ./autogen.sh
@@ -41,7 +27,7 @@ function build_linux()
     DEJAGNU=$(pwd)/.ci/site.exp BOARDSDIR=$(pwd)/.ci make check RUNTESTFLAGS="-a $RUNTESTFLAGS"
 
     ./rlgl l --key=${RLGL_KEY} https://rl.gl
-    ./rlgl e --id=${GITHUB_SHA:0:7} -l project=libffi -l sha=${GITHUB_SHA:0:7} -l CC="$CC" ${HOST+-l host=$HOST} --policy=https://github.com/libffi/rlgl-policy.git */testsuite/libffi.log
+    ./rlgl e -l project=libffi -l sha=${GITHUB_SHA:0:7} -l CC='$CC' ${HOST+-l host=$HOST} --policy=https://github.com/libffi/rlgl-policy.git */testsuite/libffi.log
     exit $?
 }
 
@@ -50,7 +36,7 @@ function build_foreign_linux()
     ${DOCKER} run --rm -t -v $(pwd):/opt ${SET_QEMU_CPU} -e LIBFFI_TEST_OPTIMIZATION="${LIBFFI_TEST_OPTIMIZATION}" $2 bash -c /opt/.ci/build-in-container.sh
 
     ./rlgl l --key=${RLGL_KEY} https://rl.gl
-    ./rlgl e --id=${GITHUB_SHA:0:7}  -l project=libffi -l sha=${GITHUB_SHA:0:7} -l CC="$CC" ${HOST+-l host=$HOST} --policy=https://github.com/libffi/rlgl-policy.git */testsuite/libffi.log
+    ./rlgl e -l project=libffi -l sha=${GITHUB_SHA:0:7} -l CC='$CC' ${HOST+-l host=$HOST} --policy=https://github.com/libffi/rlgl-policy.git */testsuite/libffi.log
     exit $?
 }
 
@@ -59,7 +45,7 @@ function build_cross_linux()
     ${DOCKER} run --rm -t -v $(pwd):/opt ${SET_QEMU_CPU} -e HOST="${HOST}" -e CC="${HOST}-gcc-8 ${GCC_OPTIONS}" -e CXX="${HOST}-g++-8 ${GCC_OPTIONS}" -e LIBFFI_TEST_OPTIMIZATION="${LIBFFI_TEST_OPTIMIZATION}" quay.io/moxielogic/cross-ci-build-container:latest bash -c /opt/.ci/build-in-container.sh
 
     ./rlgl l --key=${RLGL_KEY} https://rl.gl
-    ./rlgl e --id=${GITHUB_SHA:0:7} -l project=libffi -l sha=${GITHUB_SHA:0:7} -l CC="${HOST}-gcc-8 ${GCC_OPTIONS}" -l host=${HOST} --policy=https://github.com/libffi/rlgl-policy.git */testsuite/libffi.log
+    ./rlgl e -l project=libffi -l sha=${GITHUB_SHA:0:7} -l CC='${HOST}-gcc-8 ${GCC_OPTIONS}' -l host=${HOST} --policy=https://github.com/libffi/rlgl-policy.git */testsuite/libffi.log
     exit $?
 }
 
@@ -69,7 +55,7 @@ function build_cross()
     ${DOCKER} run --rm -t -v $(pwd):/opt -e HOST="${HOST}" -e CC="${HOST}-gcc ${GCC_OPTIONS}" -e CXX="${HOST}-g++ ${GCC_OPTIONS}" -e RUNNER_WORKSPACE=/opt -e RUNTESTFLAGS="-vv ${RUNTESTFLAGS}" -e LIBFFI_TEST_OPTIMIZATION="${LIBFFI_TEST_OPTIMIZATION}" quay.io/moxielogic/libffi-ci-${HOST} bash -c /opt/.ci/build-cross-in-container.sh
 
     ./rlgl l --key=${RLGL_KEY} https://rl.gl
-    ./rlgl e --id=${GITHUB_SHA:0:7} -l project=libffi -l sha=${GITHUB_SHA:0:7} -l CC="${HOST}-gcc" -l host=$HOST --policy=https://github.com/libffi/rlgl-policy.git */testsuite/libffi.log
+    ./rlgl e -l project=libffi -l sha=${GITHUB_SHA:0:7} -l CC='${HOST}-gcc' -l host=$HOST --policy=https://github.com/libffi/rlgl-policy.git */testsuite/libffi.log
     exit $?
 }
 
@@ -107,9 +93,6 @@ case "$HOST" in
 	./autogen.sh
         build_foreign_linux arm quay.io/moxielogic/arm32v7-ci-build-container:latest
 	;;
-    mips64el-linux-gnu | sparc64-linux-gnu)
-        build_cfarm
-	;;
     bfin-elf )
 	./autogen.sh
 	GCC_OPTIONS=-msim build_cross
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 65d4703..95f2d44 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -197,7 +197,7 @@ jobs:
           wget -qO - https://rl.gl/cli/rlgl-linux-amd64.tgz | \
                tar --strip-components=2 -xvzf - ./rlgl/rlgl;
           ./rlgl l --key=0LIBFFI-0LIBFFI-0LIBFFI-0LIBFFI https://rl.gl
-          ./rlgl e --id=${GITHUB_SHA:0:7} -l project=libffi -l sha=${GITHUB_SHA:0:7} -l CC=${{ matrix.CFARM_CC }} -l host=${{ matrix.CFARM_TRIPLE }} --policy=https://github.com/libffi/rlgl-policy.git libffi.log
+          ./rlgl e -l project=libffi -l sha=${GITHUB_SHA:0:7} -l CC='${{ matrix.CFARM_CC }}' -l host=${{ matrix.CFARM_TRIPLE }} --policy=https://github.com/libffi/rlgl-policy.git libffi.log
           exit $?
 
   build:
@@ -230,7 +230,12 @@ jobs:
           make -j 4
           TERM=none DEJAGNU=$(pwd)/.ci/site.exp BOARDSDIR=$(pwd)/.ci make check || true
           ./rlgl/rlgl.exe l --key=0LIBFFI-0LIBFFI-0LIBFFI-0LIBFFI https://rl.gl
-          ./rlgl/rlgl.exe e --id=${GITHUB_SHA:0:7} --policy=https://github.com/libffi/rlgl-policy.git $(find . -name libffi.log)
+          ./rlgl/rlgl.exe e \
+                          -l project=libffi \
+                          -l sha=${GITHUB_SHA:0:7} \
+                          -l CC=gcc \
+                          -l host=x86_64-pc-cygwin }} \
+                          --policy=https://github.com/libffi/rlgl-policy.git $(find . -name libffi.log)
         shell: C:\tools\cygwin\bin\bash.exe --login --norc -eo pipefail -o igncr '{0}'
 
   build-macos:
@@ -281,5 +286,10 @@ jobs:
           cp $(find . -name 'libffi-?.dll') x86_64-pc-cygwin/testsuite/
           TERM=none DEJAGNU=$(pwd)/.ci/site.exp BOARDSDIR=$(pwd)/.ci make check || true
           ./rlgl/rlgl.exe l --key=0LIBFFI-0LIBFFI-0LIBFFI-0LIBFFI https://rl.gl
-          ./rlgl/rlgl.exe e --id=${GITHUB_SHA:0:7} --policy=https://github.com/libffi/rlgl-policy.git $(find . -name libffi.log)
+          ./rlgl/rlgl.exe e \
+                          -l project=libffi \
+                          -l sha=${GITHUB_SHA:0:7} \
+                          -l CC=msvcc.sh \
+                          -l host=x86_64-pc-cygwin }} \
+                          --policy=https://github.com/libffi/rlgl-policy.git $(find . -name libffi.log)
         shell: C:\tools\cygwin\bin\bash.exe --login --norc -eo pipefail -o igncr '{0}'