From 1312ea0f5d484de81db26ec4411baef9534e418d Mon Sep 17 00:00:00 2001
From: Kegan Maher <kegan@compiler.la>
Date: Thu, 9 Jul 2026 00:34:42 +0000
Subject: [PATCH 1/2] refactor(ci): download mapping files from Drive rather
 than using secrets

---
 .github/workflows/monthly-time-reporting.yml | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/monthly-time-reporting.yml b/.github/workflows/monthly-time-reporting.yml
index f75a3fa..14800f8 100644
--- a/.github/workflows/monthly-time-reporting.yml
+++ b/.github/workflows/monthly-time-reporting.yml
@@ -37,16 +37,6 @@ jobs:
           mkdir -p $GAMCFGDIR/gamcache
           mkdir -p $GAMCFGDIR/Downloads
 
-          cat > $CFGDIR/toggl-project-info.json <<- EOM
-          ${{ secrets.TOGGL_PROJECT_INFO }}
-          EOM
-          echo "TOGGL_PROJECT_INFO=$CFGDIR/toggl-project-info.json" >> $GITHUB_OUTPUT
-
-          cat > $CFGDIR/toggl-user-info.json <<- EOM
-          ${{ secrets.TOGGL_USER_INFO }}
-          EOM
-          echo "TOGGL_USER_INFO=$CFGDIR/toggl-user-info.json" >> $GITHUB_OUTPUT
-
           cat > $GAMCFGDIR/gam.cfg <<- EOM
           ${{ secrets.GAM_CFG }}
           EOM
@@ -62,6 +52,12 @@ jobs:
           ${{ secrets.GOOGLE_OAUTH2_SERVICE }}
           EOM
 
+          gam user ${{ vars.GAM_USER }} get drivefile ${{ vars.TOGGL_PROJECT_INFO }} targetfolder $CFGDIR
+          echo "TOGGL_PROJECT_INFO=$CFGDIR/toggl-project-info.json" >> $GITHUB_OUTPUT
+
+          gam user ${{ vars.GAM_USER }} get drivefile ${{ vars.TOGGL_USER_INFO }} targetfolder $CFGDIR
+          echo "TOGGL_USER_INFO=$CFGDIR/toggl-user-info.json" >> $GITHUB_OUTPUT
+
       - name: Lock Toggl time entries
         id: lock
         env:

From 369fb91da5760f4e50195f9a85e0e0a989eb11af Mon Sep 17 00:00:00 2001
From: Kegan Maher <kegan@compiler.la>
Date: Thu, 9 Jul 2026 00:35:24 +0000
Subject: [PATCH 2/2] chore(ci): reuse env var definition of config dir

---
 .github/workflows/monthly-time-reporting.yml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/monthly-time-reporting.yml b/.github/workflows/monthly-time-reporting.yml
index 14800f8..725f9fd 100644
--- a/.github/workflows/monthly-time-reporting.yml
+++ b/.github/workflows/monthly-time-reporting.yml
@@ -34,6 +34,8 @@ jobs:
           CFGDIR: "${{ github.workspace }}/.config"
           GAMCFGDIR: "${{ github.workspace }}/.config/gam"
         run: |
+          echo "CFGDIR=$CFGDIR" >> $GITHUB_OUTPUT
+
           mkdir -p $GAMCFGDIR/gamcache
           mkdir -p $GAMCFGDIR/Downloads
 
@@ -146,6 +148,8 @@ jobs:
 
       - name: Cleanup
         id: cleanup
+        env:
+          CFGDIR: "${{ steps.config.outputs.CFGDIR }}"
         if: always()
         run: |
-          rm -rf .config/
+          rm -rf "$CFGDIR"