jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

GHA: Fix regressions

Browse source 
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:
William S Fulton 2021-10-13 18:26:08 +01:00
commit aaf19fbf93
1 changed files with 43 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

56
.github/workflows/ci.yml vendored
View file

@ -214,19 +214,11 @@ jobs:
cpu_count=1
;;
esac
if [[ $cpu_count != 1 ]]; then
echo SWIGJOBS=-j$cpu_count >> $GITHUB_ENV
fi
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}
;;
*)
v8 | jsc)
# Running tests using v8 or jsc involves creating a custom
# interpreter in Tools/javascript, which is currently broken
# for parallel builds (we attempt to update this interpreter
@ -234,12 +226,12 @@ jobs:
unset SWIGJOBS
esac
;;
ruby)
source $HOME/.rvm/scripts/rvm
;;
esac
if [[ $cpu_count != 1 ]]; then
echo SWIGJOBS=-j$cpu_count >> $GITHUB_ENV
fi
if test '${{ matrix.compiler }}' = 'clang'; then
CC="clang"
CXX="clang++"
@ -266,6 +258,25 @@ jobs:
- name: Configure
run: |
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
CONFIGOPTS=${{ matrix.CONFIGOPTS }}
fi
@ -287,6 +298,25 @@ jobs:
working-directory: build/build
run: |
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 "$CPP14"; then export CPPSTD=c++14; fi
if test -n "$CPP17"; then export CPPSTD=c++17; fi