From 26bdccd41658285872b9e3ac9c1b50640f99bce3 Mon Sep 17 00:00:00 2001 From: Alexander Date: Wed, 25 Jun 2025 17:34:11 -1000 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=F0=9F=9A=91=EF=B8=8F=20removed=20ha?= =?UTF-8?q?rdcoded=20value,=20causing=20service=20to=20fail?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main.py b/src/main.py index caf19cc..1927b1c 100755 --- a/src/main.py +++ b/src/main.py @@ -50,10 +50,10 @@ oauth_client_config_path=OAUTH_CLIENT_CONFIG_JSON_FILE ) -app.local_creds_manager = CredentialManager( - scopes=SCOPES, - oauth_client_config_path="../secrets/local_auth_file" -) +# app.local_creds_manager = CredentialManager( +# scopes=SCOPES, +# oauth_client_config_path=OAUTH_CLIENT_CONFIG_JSON_FILE +# ) app.secret_manager = SecretManager( project_id= PROJECT_ID, From 0028b03f56419c2ceaf0b9d17818c8076a6826d2 Mon Sep 17 00:00:00 2001 From: Alexander Date: Wed, 25 Jun 2025 17:39:25 -1000 Subject: [PATCH 2/2] ci --- .github/workflows/ci-and-deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci-and-deploy.yml b/.github/workflows/ci-and-deploy.yml index c00afb8..3de49a8 100644 --- a/.github/workflows/ci-and-deploy.yml +++ b/.github/workflows/ci-and-deploy.yml @@ -53,7 +53,7 @@ jobs: - name: Merge dev into main run: | - git merge origin/dev --no-ff --commit -m "Auto-merge dev into main from CI" + git merge origin/dev --no-ff --allow-unrelated-histories --commit -m "Auto-merge dev into main from CI" - name: Push to main run: git push origin main