Commit 4ca95b3d authored by Roger Barton's avatar Roger Barton
Browse files

Fixed CI variable bug

Now replaces space with new line in keystore.properties
parent c4705409
Pipeline #7142 passed with stages
in 4 minutes and 30 seconds
image: registry.gitlab.com/showcheap/android-ci:react-native
variables:
GIT_SUBMODULE_STRATEGY: recursive
before_script:
- sdkmanager "platforms;android-27"
- sdkmanager "build-tools;28.0.2"
- export GRADLE_USER_HOME=`pwd`/.gradle
- chmod +x ./gradlew
- npm install
- echo $PLAYSTORE_KEY > app/google-play-key.json
- echo $SIGNING_KEYSTORE > app/keystore.properties
cache:
key: "$CI_COMMIT_REF_NAME"
paths:
- .gradle/
stages:
- test
- build
- deploy
test:
stage: test
script:
- ./gradlew check
build:
stage: build
script:
- ./gradlew assembleRelease
artifacts:
paths:
- app/build/outputs/
deploy:
stage: deploy
when: manual
script:
- ./gradlew publishRelease
image: registry.gitlab.com/showcheap/android-ci:react-native
variables:
GIT_SUBMODULE_STRATEGY: recursive
before_script:
- echo $PLAYSTORE_KEY > app/google-play-key.json
- echo $SIGNING_KEYSTORE > app/keystore.properties
- sed -i 's/\s\+/\n/g' app/keystore.properties
# Note: Gitlab CI variables show newlines as a space, this will render the storePath as incorrect->Throws error that signingConfig was not found
- sdkmanager "platforms;android-27"
- sdkmanager "build-tools;27.0.3"
- export GRADLE_USER_HOME=`pwd`/.gradle
- chmod +x ./gradlew
- npm install
cache:
key: "$CI_COMMIT_REF_NAME"
paths:
- .gradle/
stages:
- test
- build
- deploy
test:
stage: test
when: manual
script:
- ./gradlew check
build:
stage: build
script:
- ./gradlew assembleRelease
artifacts:
paths:
- app/build/outputs/
deploy:
stage: deploy
when: manual
dependencies:
- build
script:
- ./gradlew publishRelease
......@@ -8,7 +8,7 @@ keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
android {
compileSdkVersion 27
buildToolsVersion '28.0.2'
buildToolsVersion '27.0.3'
playAccountConfigs {
defaultAccountConfig {
......@@ -34,6 +34,7 @@ android {
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
vectorDrawables.useSupportLibrary = true
}
buildTypes {
release {
signingConfig signingConfigs.release
......
storeFile=release_keystore.jks
storeFile=testkeystore.jks
storePassword=000000
keyAlias=releaseKey
keyAlias=release
keyPassword=000000
\ No newline at end of file
......@@ -158,7 +158,7 @@ public final class ServerRequests {
Log.e("postrequest", "Params sent: pin=" + MainActivity.CurrentPin + ", URL used: " + SettingsActivity.GetServerURL(context) + GET_DATA_URL_EXT);
JsonObjectRequest req = new JsonObjectRequest(Request.Method.GET, SettingsActivity.GetServerURL(context) + GET_DATA_URL_EXT,
null, new Response.Listener<JSONObject>() {
(JSONObject) null, new Response.Listener<JSONObject>() {
@Override
public void onResponse(JSONObject response) {
// Parsing json object response and save to the static memberDB, parse each part in a separate try catch, so we get as much info as possible
......
Subproject commit 075a0285ec32dc608782be2298504b398f3e5721
Subproject commit 2ac23ae09470d435373a1d4fe6c621e22bfcf8f3
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment