From 9b88523f1d35e76daf7345a4b90e399eca4179c5 Mon Sep 17 00:00:00 2001 From: cyBerta Date: Sat, 20 Oct 2018 10:13:21 +0200 Subject: force git submodule sync --- .gitlab-ci.yml | 5 ++++- .gitmodules | 4 ++-- cleanGit.sh | 8 ++++++++ 3 files changed, 14 insertions(+), 3 deletions(-) create mode 100755 cleanGit.sh diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 13929f10..ba0569ec 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -97,6 +97,7 @@ build: image: "0xacab.org:4567/leap/bitmask_android/android-ndk:latest" stage: build script: + - ./cleanGit.sh - ./cleanProject.sh - ./build_deps.sh - ./gradlew clean assembleDebug --stacktrace @@ -108,6 +109,7 @@ build_release: image: "0xacab.org:4567/leap/bitmask_android/android-ndk:latest" stage: build script: + - ./cleanGit.sh - ./cleanProject.sh - ./build_deps.sh - ./gradlew assembleNormalProductionRelease --stacktrace @@ -121,6 +123,7 @@ build_custom_release: image: "0xacab.org:4567/leap/bitmask_android/android-ndk:latest" stage: build script: + - ./cleanGit.sh - ./cleanProject.sh - ./build_deps.sh - ./gradlew assembleCustomProductionRelease --stacktrace @@ -128,4 +131,4 @@ build_custom_release: artifacts: paths: - app/build/outputs/ - when: manual \ No newline at end of file + when: manual diff --git a/.gitmodules b/.gitmodules index 6ba5606b..97688129 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,4 +1,4 @@ [submodule "ics-openvpn"] path = ics-openvpn - branch = bitmask - url = https://leap.se/git/ics_openvpn.git + branch = new_master + url = https://leap.se/git/ics_openvpn.git diff --git a/cleanGit.sh b/cleanGit.sh new file mode 100755 index 00000000..3c0b9271 --- /dev/null +++ b/cleanGit.sh @@ -0,0 +1,8 @@ +#!/bin/bash +#git clean -xfd +#git submodule foreach --recursive git clean -xfd +#git reset --hard +#git submodule foreach --recursive git reset --hard +git --version +git submodule sync --recursive +git submodule update --init --recursive -- cgit v1.2.3