diff --git a/.github/workflows/monthly-time-reporting.yml b/.github/workflows/monthly-time-reporting.yml index f75a3fa..725f9fd 100644 --- a/.github/workflows/monthly-time-reporting.yml +++ b/.github/workflows/monthly-time-reporting.yml @@ -34,19 +34,11 @@ jobs: CFGDIR: "${{ github.workspace }}/.config" GAMCFGDIR: "${{ github.workspace }}/.config/gam" run: | + echo "CFGDIR=$CFGDIR" >> $GITHUB_OUTPUT + 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 +54,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: @@ -150,6 +148,8 @@ jobs: - name: Cleanup id: cleanup + env: + CFGDIR: "${{ steps.config.outputs.CFGDIR }}" if: always() run: | - rm -rf .config/ + rm -rf "$CFGDIR"