status-im
/
status-react
mirror of https://github.com/status-im/status-react.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

nix: use android-sdk shell for fdroid-pr target 

Also renamed `android-env` shell to `android-sdk` to be more descriptive.

Signed-off-by: Jakub Sokołowski <jakub@status.im>
This commit is contained in:
Jakub Sokołowski 2022-09-29 12:29:28 +02:00
parent f7fedf1338
commit bcf919fcbb
No known key found for this signature in database
GPG Key ID: 09AA5403E54D9931
11 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Makefile
View File

@ -176,7 +176,7 @@ fdroid-fix-tmp: ##@prepare Fix TMPDIR permissions so Vagrant user is the owner
fdroid-build-env: fdroid-max-watches fdroid-nix-dir fdroid-fix-tmp ##@prepare Setup build environment for F-Droud build fdroid-build-env: fdroid-max-watches fdroid-nix-dir fdroid-fix-tmp ##@prepare Setup build environment for F-Droud build
fdroid-pr: export TARGET := android fdroid-pr: export TARGET := android-sdk
fdroid-pr: ##@prepare Create F-Droid release PR fdroid-pr: ##@prepare Create F-Droid release PR
ifndef APK ifndef APK
$(error APK env var not defined) $(error APK env var not defined)
@ -314,7 +314,7 @@ test: ##@test Run tests once in NodeJS
# Other # Other
#-------------- #--------------
geth-connect: export TARGET := android-env geth-connect: export TARGET := android-sdk
geth-connect: ##@other Connect to Geth on the device geth-connect: ##@other Connect to Geth on the device
adb forward tcp:8545 tcp:8545 && \ adb forward tcp:8545 tcp:8545 && \
build/bin/geth attach http://localhost:8545 build/bin/geth attach http://localhost:8545
@ -324,22 +324,22 @@ android-clean: ##@prepare Clean Gradle state
git clean -dxf -f ./android/app/build; \ git clean -dxf -f ./android/app/build; \
[[ -d android/.gradle ]] && cd android && ./gradlew clean [[ -d android/.gradle ]] && cd android && ./gradlew clean
android-ports: export TARGET := android-env android-ports: export TARGET := android-sdk
android-ports: ##@other Add proxies to Android Device/Simulator android-ports: ##@other Add proxies to Android Device/Simulator
adb reverse tcp:8081 tcp:8081 && \ adb reverse tcp:8081 tcp:8081 && \
adb reverse tcp:3449 tcp:3449 && \ adb reverse tcp:3449 tcp:3449 && \
adb reverse tcp:4567 tcp:4567 && \ adb reverse tcp:4567 tcp:4567 && \
adb forward tcp:5561 tcp:5561 adb forward tcp:5561 tcp:5561
android-devices: export TARGET := android-env android-devices: export TARGET := android-sdk
android-devices: ##@other Invoke adb devices android-devices: ##@other Invoke adb devices
adb devices adb devices
android-logcat: export TARGET := android-env android-logcat: export TARGET := android-sdk
android-logcat: ##@other Read status-mobile logs from Android phone using adb android-logcat: ##@other Read status-mobile logs from Android phone using adb
adb logcat | grep -e RNBootstrap -e ReactNativeJS -e ReactNative -e StatusModule -e StatusNativeLogs -e 'F DEBUG :' -e 'Go :' -e 'GoLog :' -e 'libc :' adb logcat | grep -e RNBootstrap -e ReactNativeJS -e ReactNative -e StatusModule -e StatusNativeLogs -e 'F DEBUG :' -e 'Go :' -e 'GoLog :' -e 'libc :'
android-install: export TARGET := android-env android-install: export TARGET := android-sdk
android-install: export BUILD_TYPE ?= release android-install: export BUILD_TYPE ?= release
android-install: ##@other Install APK on device using adb android-install: ##@other Install APK on device using adb
adb install result/app-$(BUILD_TYPE).apk adb install result/app-$(BUILD_TYPE).apk

2
ci/Jenkinsfile.android
View File

@ -1,4 +1,4 @@
library 'status-jenkins-lib@v1.5.5' library 'status-jenkins-lib@v1.5.7'
/* Options section can't access functions in objects. */ /* Options section can't access functions in objects. */
def isPRBuild = utils.isPRBuild() def isPRBuild = utils.isPRBuild()

2
ci/Jenkinsfile.combined
View File

@ -1,4 +1,4 @@
library 'status-jenkins-lib@v1.5.5' library 'status-jenkins-lib@v1.5.7'
pipeline { pipeline {
agent { label 'linux' } agent { label 'linux' }

2
ci/Jenkinsfile.ios
View File

@ -1,4 +1,4 @@
library 'status-jenkins-lib@v1.5.5' library 'status-jenkins-lib@v1.5.7'
/* Options section can't access functions in objects. */ /* Options section can't access functions in objects. */
def isPRBuild = utils.isPRBuild() def isPRBuild = utils.isPRBuild()

2
ci/Jenkinsfile.nix-cache
View File

@ -1,4 +1,4 @@
library 'status-jenkins-lib@v1.5.5' library 'status-jenkins-lib@v1.5.7'
pipeline { pipeline {
agent { label params.AGENT_LABEL } agent { label params.AGENT_LABEL }

2
ci/Jenkinsfile.tests
View File

@ -1,4 +1,4 @@
library 'status-jenkins-lib@v1.5.5' library 'status-jenkins-lib@v1.5.7'
/* Options section can't access functions in objects. */ /* Options section can't access functions in objects. */
def isPRBuild = utils.isPRBuild() def isPRBuild = utils.isPRBuild()

2
ci/tests/Jenkinsfile.e2e-prs
View File

@ -1,4 +1,4 @@
library 'status-jenkins-lib@v1.5.5' library 'status-jenkins-lib@v1.5.7'
pipeline { pipeline {

2
ci/tools/Jenkinsfile.fastlane-clean
View File

@ -1,4 +1,4 @@
library 'status-jenkins-lib@v1.5.5' library 'status-jenkins-lib@v1.5.7'
pipeline { pipeline {
agent { label 'macos' } agent { label 'macos' }

2
ci/tools/Jenkinsfile.playstore-meta
View File

@ -1,4 +1,4 @@
library 'status-jenkins-lib@v1.5.5' library 'status-jenkins-lib@v1.5.7'
pipeline { pipeline {
agent { label 'linux' } agent { label 'linux' }

2
nix/pkgs/android-sdk/shell.nix
View File

@ -1,7 +1,7 @@
{ mkShell, openjdk, androidPkgs }: { mkShell, openjdk, androidPkgs }:
mkShell { mkShell {
name = "android-env-shell"; name = "android-sdk-shell";
shellHook = '' shellHook = ''
export JAVA_HOME="${openjdk}" export JAVA_HOME="${openjdk}"

4
nix/shells.nix
View File

@ -56,8 +56,8 @@ let
buildInputs = with pkgs; [ openjdk8 apksigner ]; buildInputs = with pkgs; [ openjdk8 apksigner ];
}; };
# for targets that need 'adb' and other SDK/NDK tools # for targets needing 'adb', 'apkanalyzer' and other SDK/NDK tools
android-env = pkgs.androidShell; android-sdk = pkgs.androidShell;
# helpers for use with target argument # helpers for use with target argument
ios = targets.mobile.ios.shell; ios = targets.mobile.ios.shell;