From a96b35996f3fd27a823b6daa712fccb74cdaee0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Soko=C5=82owski?= Date: Wed, 6 May 2020 16:30:42 +0200 Subject: [PATCH] drop scripts/copy-translations.sh as useless MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jakub SokoĊ‚owski --- Makefile | 3 --- ci/Jenkinsfile.android | 2 +- ci/Jenkinsfile.combined | 2 +- ci/Jenkinsfile.ios | 2 +- ci/Jenkinsfile.linux | 2 +- ci/Jenkinsfile.macos | 2 +- ci/Jenkinsfile.nix-cache | 2 +- ci/Jenkinsfile.windows | 2 +- ci/tools/Jenkinsfile.fastlane-clean | 2 +- ci/tools/Jenkinsfile.playstore-meta | 2 +- .../android/maven-and-npm-deps/default.nix | 3 +-- scripts/copy-translations.sh | 23 ------------------- status-modules/package.json | 5 ---- 13 files changed, 10 insertions(+), 42 deletions(-) delete mode 100755 scripts/copy-translations.sh delete mode 100644 status-modules/package.json diff --git a/Makefile b/Makefile index 529137a5bb..c85530baaa 100644 --- a/Makefile +++ b/Makefile @@ -165,20 +165,17 @@ release-ios: export BUILD_ENV ?= prod release-ios: watchman-clean ##@build build release for iOS release @git clean -dxf -f target/ios && \ $(MAKE) jsbundle-ios && \ - scripts/copy-translations.sh && \ xcodebuild -workspace ios/StatusIm.xcworkspace -scheme StatusIm -configuration Release -destination 'generic/platform=iOS' -UseModernBuildSystem=N clean archive release-desktop: export TARGET ?= $(HOST_OS) release-desktop: ##@build build release for desktop release based on TARGET @$(MAKE) jsbundle-desktop && \ - scripts/copy-translations.sh && \ scripts/build-desktop.sh; \ $(MAKE) watchman-clean release-windows-desktop: export TARGET ?= windows release-windows-desktop: ##@build build release for windows desktop release @$(MAKE) jsbundle-desktop && \ - scripts/copy-translations.sh && \ scripts/build-desktop.sh; \ $(MAKE) watchman-clean diff --git a/ci/Jenkinsfile.android b/ci/Jenkinsfile.android index f9bfa2ba58..532abdbbf5 100644 --- a/ci/Jenkinsfile.android +++ b/ci/Jenkinsfile.android @@ -1,4 +1,4 @@ -library 'status-react-jenkins@v1.1.4' +library 'status-react-jenkins@v1.1.5' pipeline { agent { label 'linux' } diff --git a/ci/Jenkinsfile.combined b/ci/Jenkinsfile.combined index 61817adc90..9c1d6479be 100644 --- a/ci/Jenkinsfile.combined +++ b/ci/Jenkinsfile.combined @@ -1,4 +1,4 @@ -library 'status-react-jenkins@v1.1.4' +library 'status-react-jenkins@v1.1.5' pipeline { agent { label 'linux' } diff --git a/ci/Jenkinsfile.ios b/ci/Jenkinsfile.ios index b694bf602a..2681b9c17e 100644 --- a/ci/Jenkinsfile.ios +++ b/ci/Jenkinsfile.ios @@ -1,4 +1,4 @@ -library 'status-react-jenkins@v1.1.4' +library 'status-react-jenkins@v1.1.5' pipeline { agent { label 'macos-xcode-11.4.1' } diff --git a/ci/Jenkinsfile.linux b/ci/Jenkinsfile.linux index a7dbc05544..f3719e2915 100644 --- a/ci/Jenkinsfile.linux +++ b/ci/Jenkinsfile.linux @@ -1,4 +1,4 @@ -library 'status-react-jenkins@v1.1.4' +library 'status-react-jenkins@v1.1.5' pipeline { agent { label 'linux' } diff --git a/ci/Jenkinsfile.macos b/ci/Jenkinsfile.macos index e9d36209fa..0cc0e8310d 100644 --- a/ci/Jenkinsfile.macos +++ b/ci/Jenkinsfile.macos @@ -1,4 +1,4 @@ -library 'status-react-jenkins@v1.1.4' +library 'status-react-jenkins@v1.1.5' pipeline { agent { label 'macos-xcode-11.4.1' } diff --git a/ci/Jenkinsfile.nix-cache b/ci/Jenkinsfile.nix-cache index ae1cacb0d2..beafe50da5 100644 --- a/ci/Jenkinsfile.nix-cache +++ b/ci/Jenkinsfile.nix-cache @@ -1,4 +1,4 @@ -library 'status-react-jenkins@v1.1.4' +library 'status-react-jenkins@v1.1.5' pipeline { agent { label params.AGENT_LABEL } diff --git a/ci/Jenkinsfile.windows b/ci/Jenkinsfile.windows index c0b4c7dae7..3420a58bf4 100644 --- a/ci/Jenkinsfile.windows +++ b/ci/Jenkinsfile.windows @@ -1,4 +1,4 @@ -library 'status-react-jenkins@v1.1.4' +library 'status-react-jenkins@v1.1.5' pipeline { agent { label 'linux' } diff --git a/ci/tools/Jenkinsfile.fastlane-clean b/ci/tools/Jenkinsfile.fastlane-clean index 729c277cf7..4400fae5c2 100644 --- a/ci/tools/Jenkinsfile.fastlane-clean +++ b/ci/tools/Jenkinsfile.fastlane-clean @@ -1,4 +1,4 @@ -library 'status-react-jenkins@v1.1.1' +library 'status-react-jenkins@v1.1.5' pipeline { agent { label 'macos' } diff --git a/ci/tools/Jenkinsfile.playstore-meta b/ci/tools/Jenkinsfile.playstore-meta index afd2a88c6c..56cae66a28 100644 --- a/ci/tools/Jenkinsfile.playstore-meta +++ b/ci/tools/Jenkinsfile.playstore-meta @@ -1,4 +1,4 @@ -library 'status-react-jenkins@v1.1.1' +library 'status-react-jenkins@v1.1.5' pipeline { agent { label 'linux' } diff --git a/nix/mobile/android/maven-and-npm-deps/default.nix b/nix/mobile/android/maven-and-npm-deps/default.nix index d93afec755..647d51b34d 100644 --- a/nix/mobile/android/maven-and-npm-deps/default.nix +++ b/nix/mobile/android/maven-and-npm-deps/default.nix @@ -39,7 +39,7 @@ let lib.mkFilter { root = path; include = [ - "android/.*" "translations/.*" "status-modules/.*" + "android/.*" "status-modules/.*" "resources/.*" "mobile/js_files/.*" ".babelrc" ]; exclude = [ @@ -80,7 +80,6 @@ let chmod -R u+w ${projectBuildDir} cp -R ${projectBuildDir}/status-modules/ ${projectBuildDir}/node_modules/status-modules/ - cp -R ${projectBuildDir}/translations/ ${projectBuildDir}/node_modules/status-modules/translations/ # Set up symlinks to mobile enviroment in project root ${createMobileFilesSymlinks projectBuildDir} diff --git a/scripts/copy-translations.sh b/scripts/copy-translations.sh deleted file mode 100755 index 6abcf8ad9a..0000000000 --- a/scripts/copy-translations.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/usr/bin/env bash - -set -e - -use_chmod="$1" - -GIT_ROOT=$(cd "${BASH_SOURCE%/*}" && git rev-parse --show-toplevel) - -if [ ! -d "${GIT_ROOT}/node_modules" ]; then - echo "node_modules directory is missing, aborting!" - exit 1 -fi - -# 1. copy translations to node_modules -# 2. touch node_modules/.copied~ to avoid copying node_modules again during build - -cp -R "${GIT_ROOT}/translations" "${GIT_ROOT}/status-modules/" -[ "$use_chmod" == 'chmod' ] && chmod u+w "${GIT_ROOT}/node_modules" -cp -R "${GIT_ROOT}/status-modules" "${GIT_ROOT}/node_modules/" -[ -f "${GIT_ROOT}/node_modules/.copied~" ] && touch "${GIT_ROOT}/node_modules/.copied~" -[ "$use_chmod" == 'chmod' ] && chmod u-w "${GIT_ROOT}/node_modules" - -set +e diff --git a/status-modules/package.json b/status-modules/package.json deleted file mode 100644 index 78f9b03977..0000000000 --- a/status-modules/package.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "name": "status-modules", - "version": "1.0.0", - "files": [] -}