Commit imported data automatically, add scheduler to trigger build every day if needed

Author: kurisu-dotto-komu

.github/workflows/astro.yml

@@ -6,7 +6,7 @@ on:
   workflow_dispatch:
 
 permissions:
-  contents: read
+  contents: write
   pages: write
   id-token: write
 
@@ -27,6 +27,8 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Detect package manager
         id: detect-package-manager
@@ -73,32 +75,14 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-astro-cache-
 
-      # ===== /content cache keyed by content/meta.json (source commit) =====
-      - name: Restore content cache
-        id: content-cache
-        uses: actions/cache/restore@v4
-        with:
-          path: ${{ env.BUILD_PATH }}/content
-          key: ${{ runner.os }}-content-${{ hashFiles('content/meta.json') }}-primary
-          restore-keys: |
-            ${{ runner.os }}-content-${{ hashFiles('content/meta.json') }}-
-            ${{ runner.os }}-content-
-
-      # Always run; import should reuse restored files and fetch only updates
+      # Fetch the latest data
       - name: Fetch data
         run: npm run import
         working-directory: ${{ env.BUILD_PATH }}
         env:
           STADIA_MAPS_API_KEY: ${{ secrets.STADIA_MAPS_API_KEY }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-      # Save refreshed /content with a unique key to avoid collisions
-      - name: Save content cache
-        uses: actions/cache/save@v4
-        with:
-          path: ${{ env.BUILD_PATH }}/content
-          key: ${{ runner.os }}-content-${{ hashFiles('content/meta.json') }}-${{ github.run_id }}
-
       - name: Print env
         run: |
           echo "vars.SITE_URL='${{ vars.SITE_URL }}'"
@@ -112,6 +96,42 @@ jobs:
           SITE_URL: ${{ vars.SITE_URL }}
           BASE_PATH: ${{ vars.BASE_PATH }}
 
+      - name: Run tests
+        run: |
+          # TODO: Implement actual tests
+          echo "Tests placeholder - returning success"
+          exit 0
+        working-directory: ${{ env.BUILD_PATH }}
+
+      - name: Commit content updates
+        if: success()
+        run: |
+          # Configure git
+          git config --local user.email "github-actions[bot]@users.noreply.github.com"
+          git config --local user.name "github-actions[bot]"
+
+          # Check if there are changes to commit
+          if [ -n "$(git status --porcelain content/)" ]; then
+            # Read upstream commit from meta.json
+            UPSTREAM_COMMIT=$(jq -r '.commitHash' content/meta.json)
+            echo "Upstream commit from meta.json: $UPSTREAM_COMMIT"
+            
+            # Stage content changes, including content/meta.json
+            git add content/
+            
+            # Create commit message with upstream reference
+            git commit -m "Auto import content $UPSTREAM_COMMIT
+            
+            https://github.com/owddm/public/commit/$UPSTREAM_COMMIT"
+            
+            # Push changes
+            git push
+            
+            echo "Content updates committed and pushed"
+          else
+            echo "No content changes to commit"
+          fi
+
       # IMPORTANT: Always save Astro cache so new variants produced this run are kept.
       # Append run_id to avoid "already exists", and rely on the restore prefix above to pick the newest next time.
       - name: Save Astro cache (always)

.github/workflows/scheduler.yml

@@ -0,0 +1,61 @@
+name: Content Update Scheduler
+
+on:
+  schedule:
+    # Run daily at 11pm JST (2pm UTC)
+    - cron: "0 14 * * *"
+  workflow_dispatch:
+
+jobs:
+  check-for-updates:
+    name: Check for content updates
+    runs-on: ubuntu-latest
+    outputs:
+      has-updates: ${{ steps.check-commit.outputs.has-updates }}
+      new-commit: ${{ steps.check-commit.outputs.new-commit }}
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Check for new upstream commit
+        id: check-commit
+        run: |
+          UPSTREAM_REPO="owddm/public"
+
+          # Read current commit from meta.json
+          CURRENT_COMMIT=$(jq -r '.commitHash' content/meta.json)
+          echo "Current commit: $CURRENT_COMMIT"
+
+
+          # Get latest commit from upstream main branch
+          LATEST_COMMIT=$(curl -s "https://api.github.com/repos/$UPSTREAM_REPO/commits/main" | jq -r '.sha')
+          echo "Latest upstream commit: $LATEST_COMMIT"
+
+          if [ "$CURRENT_COMMIT" != "$LATEST_COMMIT" ]; then
+            echo "New commit detected!"
+            echo "has-updates=true" >> $GITHUB_OUTPUT
+            echo "new-commit=$LATEST_COMMIT" >> $GITHUB_OUTPUT
+          else
+            echo "No new commits"
+            echo "has-updates=false" >> $GITHUB_OUTPUT
+          fi
+
+  trigger-build:
+    name: Trigger build
+    needs: check-for-updates
+    if: needs.check-for-updates.outputs.has-updates == 'true'
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Trigger builder workflow
+        uses: actions/github-script@v7
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          script: |
+            await github.rest.actions.createWorkflowDispatch({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              workflow_id: 'astro.yml',
+              ref: 'main'
+            })