Revert "making sure CI builds don’t contaminated checked out directory on self-hosted runner"

This reverts commit 88bd6d0135. we’re trying to use this approach: https://docs.github.com/en/actions/hosting-your-own-runners/running-scripts-before-or-after-a-job
This commit is contained in:
Stefan Csomor
2022-04-17 23:33:50 +02:00
parent 88bd6d0135
commit 6afd2e8f87

View File

@@ -152,8 +152,6 @@ jobs:
run: | run: |
./build/tools/before_install.sh ./build/tools/before_install.sh
mkdir -p $PWD/localbin_${{ matrix.arch }} mkdir -p $PWD/localbin_${{ matrix.arch }}
rm -r $PWD/builddir
mkdir -p $PWD/builddir
- name: Show build environment - name: Show build environment
run: | run: |
@@ -166,7 +164,6 @@ jobs:
echo echo
- name: Configuring - name: Configuring
working-directory: builddir
run: | run: |
wxCONFIGURE_OPTIONS="--disable-optimise $wxCONFIGURE_FLAGS" wxCONFIGURE_OPTIONS="--disable-optimise $wxCONFIGURE_FLAGS"
@@ -175,14 +172,15 @@ jobs:
wxCONFIGURE_OPTIONS="--with-macosx-sdk=$sdk_path $wxCONFIGURE_OPTIONS" wxCONFIGURE_OPTIONS="--with-macosx-sdk=$sdk_path $wxCONFIGURE_OPTIONS"
fi fi
./configure $wxCONFIGURE_OPTIONS --disable-debug_info || rc=$?
if [ ${{ matrix.use_asan }} ]; then if [ ${{ matrix.use_asan }} ]; then
wxASAN_CFLAGS="-fsanitize=address -fno-omit-frame-pointer" wxASAN_CFLAGS="-fsanitize=address -fno-omit-frame-pointer"
wxASAN_CXXFLAGS=$wxASAN_CFLAGS wxASAN_CXXFLAGS=$wxASAN_CFLAGS
wxASAN_LDFLAGS="-fsanitize=address" wxASAN_LDFLAGS="-fsanitize=address"
../configure $wxCONFIGURE_OPTIONS --enable-debug "CFLAGS=$wxASAN_CFLAGS" "CXXFLAGS=$wxASAN_CXXFLAGS" "LDFLAGS=$wxASAN_LDFLAGS" || rc=$? ./configure $wxCONFIGURE_OPTIONS --enable-debug "CFLAGS=$wxASAN_CFLAGS" "CXXFLAGS=$wxASAN_CXXFLAGS" "LDFLAGS=$wxASAN_LDFLAGS" || rc=$?
else else
../configure $wxCONFIGURE_OPTIONS --disable-debug_info || rc=$? ./configure $wxCONFIGURE_OPTIONS --disable-debug_info || rc=$?
fi fi
if [ -n "$rc" ]; then if [ -n "$rc" ]; then
echo '*** Configuring failed, contents of config.log follows: ***' echo '*** Configuring failed, contents of config.log follows: ***'
@@ -193,21 +191,19 @@ jobs:
fi fi
- name: Building - name: Building
working-directory: builddir
run: | run: |
make -k $wxBUILD_ARGS "CXXFLAGS=$wxMAKEFILE_ERROR_CXXFLAGS" make -k $wxBUILD_ARGS "CXXFLAGS=$wxMAKEFILE_ERROR_CXXFLAGS"
- name: Building tests - name: Building tests
working-directory: builddir
run: | run: |
make -C tests $wxBUILD_ARGS failtest make -C tests $wxBUILD_ARGS failtest
make -k -C tests $wxBUILD_ARGS "CXXFLAGS=$wxMAKEFILE_CXXFLAGS" "LDFLAGS=$wxMAKEFILE_LDFLAGS" make -k -C tests $wxBUILD_ARGS "CXXFLAGS=$wxMAKEFILE_CXXFLAGS" "LDFLAGS=$wxMAKEFILE_LDFLAGS"
- name: Testing - name: Testing
if: matrix.skip_testing != true if: matrix.skip_testing != true
working-directory: builddir/tests working-directory: tests
run: | run: |
. ../../build/tools/httpbin.sh . ../build/tools/httpbin.sh
httpbin_launch httpbin_launch
export ASAN_OPTIONS=fast_unwind_on_malloc=0 export ASAN_OPTIONS=fast_unwind_on_malloc=0
# Explicitly use bash because /bin/sh doesn't have pipefail option # Explicitly use bash because /bin/sh doesn't have pipefail option
@@ -219,7 +215,7 @@ jobs:
- name: Testing GUI - name: Testing GUI
if: matrix.skip_testing != true if: matrix.skip_testing != true
working-directory: builddir/tests working-directory: tests
run: | run: |
# We currently need to disable container overflow detection as we get # We currently need to disable container overflow detection as we get
# what seems to be a false positive in BitmapComboBoxTestCase triggered # what seems to be a false positive in BitmapComboBoxTestCase triggered
@@ -232,19 +228,16 @@ jobs:
- name: Building samples - name: Building samples
if: matrix.skip_testing != true && matrix.skip_samples != true if: matrix.skip_testing != true && matrix.skip_samples != true
working-directory: builddir
run: | run: |
make -k $wxBUILD_ARGS "CXXFLAGS=$wxMAKEFILE_CXXFLAGS" "LDFLAGS=$wxMAKEFILE_LDFLAGS" samples make -k $wxBUILD_ARGS "CXXFLAGS=$wxMAKEFILE_CXXFLAGS" "LDFLAGS=$wxMAKEFILE_LDFLAGS" samples
- name: Installing - name: Installing
if: matrix.skip_testing != true if: matrix.skip_testing != true
working-directory: builddir
run: | run: |
make install make install
- name: Testing installation - name: Testing installation
if: matrix.skip_testing != true if: matrix.skip_testing != true
working-directory: builddir
run: | run: |
make -C ../samples/minimal -f makefile.unx clean make -C samples/minimal -f makefile.unx clean
make -C ../samples/minimal -f makefile.unx WX_CONFIG=${{ github.workspace }}/localbin_${{ matrix.arch }}/bin/wx-config $wxBUILD_ARGS "CXXFLAGS=$wxMAKEFILE_CXXFLAGS" "LDFLAGS=$wxMAKEFILE_LDFLAGS" make -C samples/minimal -f makefile.unx WX_CONFIG=${{ github.workspace }}/localbin_${{ matrix.arch }}/bin/wx-config $wxBUILD_ARGS "CXXFLAGS=$wxMAKEFILE_CXXFLAGS" "LDFLAGS=$wxMAKEFILE_LDFLAGS"