From 35b32a2f6568deba853b980de756360924432284 Mon Sep 17 00:00:00 2001 From: Martin/Geno Date: Tue, 7 May 2019 16:07:53 +0200 Subject: [PATCH] [CI] move build fork to ci --- .gitlab-ci.yml | 5 ++++- build-fork.sh | 17 ----------------- 2 files changed, 4 insertions(+), 18 deletions(-) delete mode 100755 build-fork.sh diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6b53a6fc9..014cd2e34 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -28,7 +28,10 @@ publish: only: - develop script: - - ./build-fork.sh + - find -type d -name "siacs" -print0 | xargs --null -I{} bash -c 'x="{}"; mv "$x" "${x/siacs/sum7}" ' + - find -type f -name "*.java" -exec sed -i "/eu.siacs.conversations.axolotl/! s/eu.siacs./eu.sum7./" "{}" \; + - find -type f -name "*.xml" -exec sed -i "/eu.siacs.conversations.axolotl/! s/eu.siacs./eu.sum7./" "{}" \; + - sed -i "s/eu.siacs./eu.sum7./" "proguard-rules.pro" # workaround for bug in fdroid nightly - sed -i "s/-debug.apk/-unsigned.apk/" /usr/lib/python3/dist-packages/fdroidserver/nightly.py - sed -i "s/servergitmirror = 'git@' +/servergitmirror = 'gitlab@' +/" /usr/lib/python3/dist-packages/fdroidserver/nightly.py diff --git a/build-fork.sh b/build-fork.sh deleted file mode 100755 index 18d1e39f3..000000000 --- a/build-fork.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/sh - -echo "rename folders" - -for folder in $(find -type d -name "siacs"); do - newfolder="$(echo $folder | sed "s/siacs/sum7/")"; - echo "$folder -> $newfolder" - mv "$folder" "$newfolder" -done - -echo "fix packageing" -for file in $(find -type f -name "*.xml" -or -name "*.java"); do - sed -i "s/eu.siacs./eu.sum7./" "$file" - echo "$file: $?" -done - -sed -i "s/eu.siacs./eu.sum7./" "proguard-rules.pro"