diff options
| author | cyBerta <cyberta@riseup.net> | 2022-07-17 10:22:43 +0200 |
|---|---|---|
| committer | cyBerta <cyberta@riseup.net> | 2022-07-19 02:07:43 +0200 |
| commit | fd7e5b398091ac2f110e44a2c4a594ffe721e80d (patch) | |
| tree | fa8f606c506164f3aa28748ac08fca382305daa9 | |
| parent | 71ee3eaea9bb3ff197ec36bc3684f2db33f7944c (diff) | |
remove outdated golibs before rebuilding them and running test on CI
| -rw-r--r-- | .gitlab-ci.yml | 2 | ||||
| -rwxr-xr-x | scripts/prepareForTests.sh | 28 |
2 files changed, 29 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2577060e..286e6d45 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -55,7 +55,7 @@ unit_test: image: "0xacab.org:4567/leap/bitmask_android/android-ndk:latest" stage: test script: - - BUILD_TOR=false BUILD_OPENVPN_LIBS=false ./scripts/build_deps.sh + - ./scripts/prepareForTests.sh - ./gradlew testCustomProductionFatReleaseUnitTest testNormalProductionFatReleaseUnitTest artifacts: paths: diff --git a/scripts/prepareForTests.sh b/scripts/prepareForTests.sh new file mode 100755 index 00000000..d10a04b7 --- /dev/null +++ b/scripts/prepareForTests.sh @@ -0,0 +1,28 @@ +#!/bin/bash + +# Copyright (c) 2022 LEAP Encryption Access Project and contributors +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. + +SCRIPT_DIR=$(dirname "$0") +BASE_DIR="$SCRIPT_DIR/.." + +git checkout -- \* +git checkout -- \.\* +rm -r $BASE_DIR/bitmaskcore/lib/* +git submodule foreach --recursive git reset --hard HEAD +git submodule sync --recursive +git submodule update --init --recursive + +BUILD_TOR=false BUILD_OPENVPN_LIBS=false ./scripts/build_deps.sh
\ No newline at end of file |