From e2acd666dfb14bd9c5762cff405bbb6adce7b3ce Mon Sep 17 00:00:00 2001 From: "Markus F.X.J. Oberhumer" Date: Tue, 25 Oct 2022 02:53:49 +0200 Subject: [PATCH] CI: remove some obsolete stuff --- .github/travis_build.sh | 80 ++--------------------------------------- .github/travis_init.sh | 11 ++---- 2 files changed, 5 insertions(+), 86 deletions(-) diff --git a/.github/travis_build.sh b/.github/travis_build.sh index 408a50b6..a783d061 100644 --- a/.github/travis_build.sh +++ b/.github/travis_build.sh @@ -4,6 +4,8 @@ set -e; set -o pipefail # Copyright (C) Markus Franz Xaver Johannes Oberhumer +# ...lots of outdated/unneeded stuff from the old Travis/Circle/AppVeyor CI days... + if [[ $TRAVIS_OS_NAME == osx ]]; then argv0=$0; argv0abs=$(greadlink -en -- "$0"); argv0dir=$(dirname "$argv0abs") else @@ -88,80 +90,4 @@ if [[ $BM_X =~ (^|\+)rebuild-stubs($|\+) ]]; then unset bin_upx extra_subdirs d failed fi -# -# build UCL -# - -cd / && cd "$ucl_BUILDDIR" || exit 1 -# patch UCL -sed 's/^#elif (ACC_ARCH_AMD64 || ACC_ARCH_IA64)$/& \&\& !defined(__ILP32__)/' $ucl_SRCDIR/acc/acc_chk.ch > a.tmp -if cmp -s a.tmp $ucl_SRCDIR/acc/acc_chk.ch; then rm a.tmp; else mv a.tmp $ucl_SRCDIR/acc/acc_chk.ch; fi -if [[ $BUILD_LOCAL_UCL == 1 ]]; then - # ucl-1.03/configure is too old - build manually - rm -f ./*.o libucl.a - $CC -O2 -I$ucl_SRCDIR/include -I$ucl_SRCDIR -c $ucl_SRCDIR/src/*.c - $AR rcs libucl.a *.o - mkdir -p src/.libs - cp libucl.a src/.libs -else - if [[ ! -f config.status ]]; then - $ucl_SRCDIR/configure --enable-static --disable-shared --disable-asm - fi - make -fi - -# -# build zlib -# - -if [[ $BUILD_LOCAL_ZLIB == 1 ]]; then - cd / && cd "$zlib_BUILDDIR" || exit 1 - # build manually - rm -f ./*.o libz.a - $CC -O2 -c $zlib_SRCDIR/*.c - $AR rcs libz.a *.o -fi - -# -# build UPX -# - -export UPX_UCLDIR="$ucl_SRCDIR" -cd / && cd "$upx_BUILDDIR" || exit 1 -make="make -f $upx_SRCDIR/src/Makefile" -EXTRA_LDFLAGS="$EXTRA_LDFLAGS -L$ucl_BUILDDIR/src/.libs" -if [[ $BUILD_LOCAL_ZLIB == 1 ]]; then - EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS -I$zlib_SRCDIR" - EXTRA_LDFLAGS="$EXTRA_LDFLAGS -L$zlib_BUILDDIR" -fi -if [[ $BM_B =~ (^|\+)coverage($|\+) ]]; then - EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -fprofile-arcs -ftest-coverage" - EXTRA_LDFLAGS="$EXTRA_LDFLAGS -fprofile-arcs -ftest-coverage" -fi -if [[ $BM_B =~ (^|\+)debug($|\+) ]]; then - make="$make BUILD_TYPE_DEBUG=1" -fi -if [[ $BM_B =~ (^|\+)sanitize($|\+) ]]; then - make="$make BUILD_TYPE_SANITIZE=1" -fi -if [[ $BM_B =~ (^|\+)scan-build($|\+) ]]; then - make="$SCAN_BUILD $make" -fi -if [[ $BM_B =~ (^|\+)valgrind($|\+) ]]; then - EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS -DWITH_VALGRIND" -fi -if [[ $BM_B =~ (^|\+)ALLOW_FAIL($|\+) ]]; then - echo "ALLOW_FAIL" - set +e -fi -export EXTRA_CPPFLAGS EXTRA_CXXFLAGS EXTRA_LDFLAGS - -[[ -z $upx_exeext ]] && upx_exeext=.out -$make exeext=$upx_exeext - -pwd -ls -l upx${upx_exeext} -$SIZE upx${upx_exeext} || true -file upx${upx_exeext} - -exit 0 +exit 1 diff --git a/.github/travis_init.sh b/.github/travis_init.sh index 4347f9a7..4d5e73ba 100644 --- a/.github/travis_init.sh +++ b/.github/travis_init.sh @@ -2,6 +2,8 @@ # Copyright (C) Markus Franz Xaver Johannes Oberhumer +# ...lots of outdated/unneeded stuff from the old Travis/Circle/AppVeyor CI days... + #set -x # debug umask 022 export GIT_PAGER= @@ -268,13 +270,4 @@ print_settings() { ##env | LC_ALL=C sort } -fix_home_ssh_perms() { - if [[ -d ~/.ssh ]]; then - if [[ -x /usr/sbin/restorecon ]]; then - /usr/sbin/restorecon -v -R ~/.ssh || true - fi - chmod -c -R go-rwx ~/.ssh || true - fi -} - true