analysis workflow, fixup ios test.
@@ -56,14 +56,14 @@ jobs:
IOS_SDK: iPhoneOS
IOS_CPU: armv7s
test_ios: "yes"
- config: 'no'
- make_install: "yes"
+ config: "no"
+ make: "no"
steps:
- uses: actions/checkout@v2
with:
submodules: false
- - name: install ios tools
+ - name: test ios
if: ${{ matrix.test_ios == 'yes' }}
env:
AUTOTOOLS_HOST: ${{ matrix.AUTOTOOLS_HOST }}
@@ -73,14 +73,20 @@ jobs:
run: |
#(already installed) ./contrib/ios/install_tools.sh
export AUTOTOOLS_BUILD="$(./config.guess)"
+ echo AUTOTOOLS_BUILD=${AUTOTOOLS_BUILD}
export IOS_PREFIX="$HOME/$IOS_SDK-$IOS_CPU"
+ echo IOS_PREFIX=${IOS_PREFIX}
export PKG_CONFIG_PATH="$IOS_PREFIX/lib/pkgconfig"
+ echo PKG_CONFIG_PATH=${PKG_CONFIG_PATH}
+ export CONFIG_OPTS="--build=$AUTOTOOLS_BUILD --host=$AUTOTOOLS_HOST --prefix=$IOS_PREFIX --with-ssl=$IOS_PREFIX --disable-gost --with-libexpat=$IOS_PREFIX"
+ echo CONFIG_OPTS=${CONFIG_OPTS}
source ./contrib/ios/setenv_ios.sh
./contrib/ios/install_openssl.sh
./contrib/ios/install_expat.sh
- export CONFIG_OPTS="--build=$AUTOTOOLS_BUILD --host=$AUTOTOOLS_HOST --prefix=$IOS_PREFIX --with-ssl=$IOS_PREFIX --disable-gost --with-libexpat=$IOS_PREFIX"
- echo CONFIG_OPTS ${CONFIG_OPTS}
./configure ${CONFIG_OPTS}
+ # make is here to preserve environment variables
+ make
+ make install
- name: install libevent
if: ${{ matrix.install_libevent == 'yes' }}
run: sudo apt-get install libevent-dev
@@ -91,13 +97,11 @@ jobs:
if: ${{ matrix.config != 'no' }}
run: ./configure ${{ matrix.config }}
- name: make
+ if: ${{ matrix.make != 'no' }}
run: make
- name: make test
if: ${{ matrix.make_test == 'yes' }}
run: make test
- - name: make install
- if: ${{ matrix.make_install == 'yes' }}
- run: make install
- name: clang-analysis
if: ${{ matrix.clang_analysis == 'yes' }}
run: (cd testdata/clang-analysis.tdir; bash clang-analysis.test)
