diff options
| author | Anthony Green <green@moxielogic.com> | 2021-07-04 08:42:23 -0400 |
|---|---|---|
| committer | Anthony Green <green@moxielogic.com> | 2021-07-04 08:42:43 -0400 |
| commit | e4b4fc6bc598b41bde06dfc892071ff708a7e661 (patch) | |
| tree | 210b732968be9ed42e1659fcaf33b47993a6c151 | |
| parent | fd5a529ca1ab08b8fd0c4534c9c7d5379405a637 (diff) | |
| download | libffi-e4b4fc6bc598b41bde06dfc892071ff708a7e661.tar.gz | |
Shift from travis-ci to github actions
| -rwxr-xr-x | .ci/build-cross-in-container.sh | 3 | ||||
| -rwxr-xr-x | .ci/build-in-container.sh | 7 | ||||
| -rwxr-xr-x | .ci/build.sh | 2 | ||||
| -rw-r--r-- | .github/workflows/build.yml | 2 |
4 files changed, 3 insertions, 11 deletions
diff --git a/.ci/build-cross-in-container.sh b/.ci/build-cross-in-container.sh index 7e2252c..3fd5cad 100755 --- a/.ci/build-cross-in-container.sh +++ b/.ci/build-cross-in-container.sh @@ -6,9 +6,8 @@ echo $PATH export PATH=/usr/local/bin:$PATH echo $PATH +DEJAGNU=$(pwd)/.ci/site.exp ./configure --host=${HOST} || cat */config.log make make dist make check RUNTESTFLAGS="-a $RUNTESTFLAGS" || true - - diff --git a/.ci/build-in-container.sh b/.ci/build-in-container.sh index 75bfe3d..9a404b9 100755 --- a/.ci/build-in-container.sh +++ b/.ci/build-in-container.sh @@ -1,14 +1,9 @@ #!/bin/bash set -x -cd /opt - export QEMU_LD_PREFIX=/usr/${HOST} -pwd -env -ls -la - +DEJAGNU=$(pwd)/.ci/site.exp ./configure ${HOST+--host=$HOST --disable-shared} make make dist diff --git a/.ci/build.sh b/.ci/build.sh index 3e41a14..fbf7785 100755 --- a/.ci/build.sh +++ b/.ci/build.sh @@ -66,7 +66,7 @@ function build_cross_linux() function build_cross() { ${DOCKER} pull quay.io/moxielogic/libffi-ci-${HOST} - ${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 DEJAGNU="${DEJAGNU}" -e RUNTESTFLAGS="${RUNTESTFLAGS}" -e LIBFFI_TEST_OPTIMIZATION="${LIBFFI_TEST_OPTIMIZATION}" quay.io/moxielogic/libffi-ci-${HOST} bash -c /opt/.ci/build-cross-in-container.sh + ${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="${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 ID=$(./rlgl start) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3f791ab..a52e2d2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -23,10 +23,8 @@ jobs: include: - HOST: "powerpc-eabisim" RUNTESTFLAGS: "--target_board powerpc-eabisim" - DEJAGNU: "/opt/.ci/site.exp" - HOST: "or1k-elf" RUNTESTFLAGS: "--target_board or1k-sim" - DEJAGNU: "/opt/.ci/site.exp" - MEVAL: "export PATH=/opt/moxielogic/bin:$PATH && CC=moxie-elf-gcc && CXX=moxie-elf-g++" HOST: "moxie-elf" LDFLAGS: "-Tsim.ld" |