GHA: Fix regressions
The environment variables are not kept between runs, arg. Temp hack to try and get export env working for Configure and Test steps.
This commit is contained in:
parent
61983e04b0
commit
aaf19fbf93
1 changed files with 43 additions and 13 deletions
56
.github/workflows/ci.yml
vendored
56
.github/workflows/ci.yml
vendored
|
|
@ -214,19 +214,11 @@ jobs:
|
||||||
cpu_count=1
|
cpu_count=1
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
if [[ $cpu_count != 1 ]]; then
|
|
||||||
echo SWIGJOBS=-j$cpu_count >> $GITHUB_ENV
|
|
||||||
fi
|
|
||||||
|
|
||||||
case "$SWIGLANG" in
|
case "$SWIGLANG" in
|
||||||
javascript)
|
javascript)
|
||||||
case "$ENGINE" in
|
case "$ENGINE" in
|
||||||
node)
|
v8 | jsc)
|
||||||
export NVM_DIR="$HOME/.nvm"
|
|
||||||
[ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh"
|
|
||||||
nvm use ${VER}
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
# Running tests using v8 or jsc involves creating a custom
|
# Running tests using v8 or jsc involves creating a custom
|
||||||
# interpreter in Tools/javascript, which is currently broken
|
# interpreter in Tools/javascript, which is currently broken
|
||||||
# for parallel builds (we attempt to update this interpreter
|
# for parallel builds (we attempt to update this interpreter
|
||||||
|
|
@ -234,12 +226,12 @@ jobs:
|
||||||
unset SWIGJOBS
|
unset SWIGJOBS
|
||||||
esac
|
esac
|
||||||
;;
|
;;
|
||||||
|
|
||||||
ruby)
|
|
||||||
source $HOME/.rvm/scripts/rvm
|
|
||||||
;;
|
|
||||||
esac
|
esac
|
||||||
|
|
||||||
|
if [[ $cpu_count != 1 ]]; then
|
||||||
|
echo SWIGJOBS=-j$cpu_count >> $GITHUB_ENV
|
||||||
|
fi
|
||||||
|
|
||||||
if test '${{ matrix.compiler }}' = 'clang'; then
|
if test '${{ matrix.compiler }}' = 'clang'; then
|
||||||
CC="clang"
|
CC="clang"
|
||||||
CXX="clang++"
|
CXX="clang++"
|
||||||
|
|
@ -266,6 +258,25 @@ jobs:
|
||||||
- name: Configure
|
- name: Configure
|
||||||
run: |
|
run: |
|
||||||
set -x
|
set -x
|
||||||
|
|
||||||
|
# Repeat language specific environment setup
|
||||||
|
case "$SWIGLANG" in
|
||||||
|
javascript)
|
||||||
|
case "$ENGINE" in
|
||||||
|
node)
|
||||||
|
export NVM_DIR="$HOME/.nvm"
|
||||||
|
[ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh"
|
||||||
|
nvm use ${VER}
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
esac
|
||||||
|
;;
|
||||||
|
|
||||||
|
ruby)
|
||||||
|
source $HOME/.rvm/scripts/rvm
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
|
||||||
if test -n '${{ matrix.CONFIGOPTS }}'; then
|
if test -n '${{ matrix.CONFIGOPTS }}'; then
|
||||||
CONFIGOPTS=${{ matrix.CONFIGOPTS }}
|
CONFIGOPTS=${{ matrix.CONFIGOPTS }}
|
||||||
fi
|
fi
|
||||||
|
|
@ -287,6 +298,25 @@ jobs:
|
||||||
working-directory: build/build
|
working-directory: build/build
|
||||||
run: |
|
run: |
|
||||||
set -x
|
set -x
|
||||||
|
|
||||||
|
# Repeat language specific environment setup
|
||||||
|
case "$SWIGLANG" in
|
||||||
|
javascript)
|
||||||
|
case "$ENGINE" in
|
||||||
|
node)
|
||||||
|
export NVM_DIR="$HOME/.nvm"
|
||||||
|
[ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh"
|
||||||
|
nvm use ${VER}
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
esac
|
||||||
|
;;
|
||||||
|
|
||||||
|
ruby)
|
||||||
|
source $HOME/.rvm/scripts/rvm
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
|
||||||
if test -n "$CPP11"; then export CPPSTD=c++11; fi
|
if test -n "$CPP11"; then export CPPSTD=c++11; fi
|
||||||
if test -n "$CPP14"; then export CPPSTD=c++14; fi
|
if test -n "$CPP14"; then export CPPSTD=c++14; fi
|
||||||
if test -n "$CPP17"; then export CPPSTD=c++17; fi
|
if test -n "$CPP17"; then export CPPSTD=c++17; fi
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue