From ed4031b31ab0cb767d028fa149fe7e89517d8c6c Mon Sep 17 00:00:00 2001 From: Romain Hunault Date: Thu, 21 Nov 2024 13:29:20 +0000 Subject: [PATCH 1/4] Test with other credentials --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 0904d436..5063f2b3 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -119,8 +119,8 @@ android { buildConfigField "String", "MURENA_BASE_URL", "\"${retrieveKey("MURENA_BASE_URL")}\"" buildConfigField "String", "MURENA_DISCOVERY_END_POINT", "\"${retrieveKey("MURENA_DISCOVERY_END_POINT")}\"" - buildConfigField "String", "GOOGLE_CLIENT_ID", "\"${retrieveKey("GOOGLE_CLIENT_ID")}\"" - buildConfigField "String", "GOOGLE_REDIRECT_URI", "\"${retrieveKey("GOOGLE_REDIRECT_URI")}\"" + buildConfigField "String", "GOOGLE_CLIENT_ID", "\"${retrieveKey("GOOGLE_CLIENT_ID_OFFICIAL")}\"" + buildConfigField "String", "GOOGLE_REDIRECT_URI", "\"${retrieveKey("GOOGLE_REDIRECT_URI_OFFICIAL")}\"" buildConfigField "String", "YAHOO_CLIENT_ID", "\"${retrieveKey("YAHOO_CLIENT_ID")}\"" -- GitLab From 4d7da557447fee39468f46747d70db7a161ab1cc Mon Sep 17 00:00:00 2001 From: Romain Hunault Date: Thu, 21 Nov 2024 13:36:25 +0000 Subject: [PATCH 2/4] Update 2 files - /.gitlab-ci.yml - /app/build.gradle --- .gitlab-ci.yml | 4 ++-- app/build.gradle | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index def4b665..7c7889a5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -21,8 +21,8 @@ before_script: - echo MURENA_LOGOUT_REDIRECT_URI=$MURENA_LOGOUT_REDIRECT_URI >> local.properties - echo MURENA_BASE_URL=$MURENA_BASE_URL >> local.properties - echo MURENA_DISCOVERY_END_POINT=$MURENA_DISCOVERY_END_POINT >> local.properties - - echo GOOGLE_CLIENT_ID=$GOOGLE_CLIENT_ID >> local.properties - - echo GOOGLE_REDIRECT_URI=$GOOGLE_REDIRECT_URI >> local.properties + - echo GOOGLE_CLIENT_ID_OFFICIAL=$GOOGLE_CLIENT_ID >> local.properties + - echo GOOGLE_REDIRECT_URI_OFFICIAL=$GOOGLE_REDIRECT_URI >> local.properties - echo YAHOO_CLIENT_ID=$YAHOO_CLIENT_ID >> local.properties - export GRADLE_USER_HOME=$(pwd)/.gradle - chmod +x ./gradlew diff --git a/app/build.gradle b/app/build.gradle index 5063f2b3..0904d436 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -119,8 +119,8 @@ android { buildConfigField "String", "MURENA_BASE_URL", "\"${retrieveKey("MURENA_BASE_URL")}\"" buildConfigField "String", "MURENA_DISCOVERY_END_POINT", "\"${retrieveKey("MURENA_DISCOVERY_END_POINT")}\"" - buildConfigField "String", "GOOGLE_CLIENT_ID", "\"${retrieveKey("GOOGLE_CLIENT_ID_OFFICIAL")}\"" - buildConfigField "String", "GOOGLE_REDIRECT_URI", "\"${retrieveKey("GOOGLE_REDIRECT_URI_OFFICIAL")}\"" + buildConfigField "String", "GOOGLE_CLIENT_ID", "\"${retrieveKey("GOOGLE_CLIENT_ID")}\"" + buildConfigField "String", "GOOGLE_REDIRECT_URI", "\"${retrieveKey("GOOGLE_REDIRECT_URI")}\"" buildConfigField "String", "YAHOO_CLIENT_ID", "\"${retrieveKey("YAHOO_CLIENT_ID")}\"" -- GitLab From c60766550c4370a87086e814d7fba3136854a2aa Mon Sep 17 00:00:00 2001 From: Romain Hunault Date: Thu, 21 Nov 2024 13:38:06 +0000 Subject: [PATCH 3/4] Fix syntax --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7c7889a5..97923c9d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -21,8 +21,8 @@ before_script: - echo MURENA_LOGOUT_REDIRECT_URI=$MURENA_LOGOUT_REDIRECT_URI >> local.properties - echo MURENA_BASE_URL=$MURENA_BASE_URL >> local.properties - echo MURENA_DISCOVERY_END_POINT=$MURENA_DISCOVERY_END_POINT >> local.properties - - echo GOOGLE_CLIENT_ID_OFFICIAL=$GOOGLE_CLIENT_ID >> local.properties - - echo GOOGLE_REDIRECT_URI_OFFICIAL=$GOOGLE_REDIRECT_URI >> local.properties + - echo GOOGLE_CLIENT_ID=$GOOGLE_CLIENT_ID_OFFICIAL >> local.properties + - echo GOOGLE_REDIRECT_URI=$GOOGLE_REDIRECT_URI_OFFICIAL >> local.properties - echo YAHOO_CLIENT_ID=$YAHOO_CLIENT_ID >> local.properties - export GRADLE_USER_HOME=$(pwd)/.gradle - chmod +x ./gradlew -- GitLab From 48271eea4c366f8b3812ded2d81cb270cb108b1e Mon Sep 17 00:00:00 2001 From: Romain Hunault Date: Thu, 21 Nov 2024 14:02:56 +0000 Subject: [PATCH 4/4] New try with other values --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 97923c9d..4da9427b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -21,8 +21,8 @@ before_script: - echo MURENA_LOGOUT_REDIRECT_URI=$MURENA_LOGOUT_REDIRECT_URI >> local.properties - echo MURENA_BASE_URL=$MURENA_BASE_URL >> local.properties - echo MURENA_DISCOVERY_END_POINT=$MURENA_DISCOVERY_END_POINT >> local.properties - - echo GOOGLE_CLIENT_ID=$GOOGLE_CLIENT_ID_OFFICIAL >> local.properties - - echo GOOGLE_REDIRECT_URI=$GOOGLE_REDIRECT_URI_OFFICIAL >> local.properties + - echo GOOGLE_CLIENT_ID=$GOOGLE_CLIENT_ID_TEST >> local.properties + - echo GOOGLE_REDIRECT_URI=$GOOGLE_REDIRECT_URI_TEST >> local.properties - echo YAHOO_CLIENT_ID=$YAHOO_CLIENT_ID >> local.properties - export GRADLE_USER_HOME=$(pwd)/.gradle - chmod +x ./gradlew -- GitLab