m038/intotheeast-com
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

docs: fix plan commit steps for user/ git repo separation

Browse Source 
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
Mischa
2026-06-18 23:12:52 +02:00
parent b98ae50f30
commit 6fe066e77d
1 changed files with 26 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/superpowers/plans/2026-06-18-grav2-upgrade.md
+26 -7
View File
@@ -13,7 +13,8 @@
- All work on branch `update-to-2.0` (already created) - All work on branch `update-to-2.0` (already created)
- Never read `.env` — contains sensitive credentials - Never read `.env` — contains sensitive credentials
- Only modify files in the project root or `user/` subfolders - Only modify files in the project root or `user/` subfolders
- `user/config/`, `user/plugins/cache-on-save/`, `user/themes/` changes go through the `user/` git repo (tracked separately; push with `make content-push`) - `user/config/system.yaml` is tracked in the **user/ git repo** — commit it with `git -C user add config/system.yaml && git -C user commit ...`, NOT from the main repo
- `user/plugins/cache-on-save/` is tracked in the **main repo** (after adding `.gitignore` exception) — commit blueprints.yaml with `git add user/plugins/cache-on-save/blueprints.yaml` from the project root
- Container name stays `intotheeast_grav`; local port stays `8081` - Container name stays `intotheeast_grav`; local port stays `8081`
- `make` commands are the only way to interact with the remote server - `make` commands are the only way to interact with the remote server
- Grav 2.0 requires PHP ≥ 8.3 (dev container uses 8.3 default; production uses 8.4 — both compliant) - Grav 2.0 requires PHP ≥ 8.3 (dev container uses 8.3 default; production uses 8.4 — both compliant)
@@ -27,7 +28,8 @@
|---|---|---| |---|---|---|
| `docker-compose.yml` | Modify | Switch image, update volume + PHP ini path, add env var | | `docker-compose.yml` | Modify | Switch image, update volume + PHP ini path, add env var |
| `Makefile` | Modify | Three `docker exec` targets hardcode linuxserver's `/app/www/public` path | | `Makefile` | Modify | Three `docker exec` targets hardcode linuxserver's `/app/www/public` path |
| `user/plugins/cache-on-save/blueprints.yaml` | Create | Grav 2.0 compat flag (required by GPM) | | `.gitignore` | Modify | Add `!user/plugins/cache-on-save/` exception to track the custom plugin in the main repo |
| `user/plugins/cache-on-save/blueprints.yaml` | Create | Grav 2.0 compat flag (required by GPM) — committed to main repo |
| `user/config/system.yaml` | Modify | Switch GPM channel from `stable` to `testing` | | `user/config/system.yaml` | Modify | Switch GPM channel from `stable` to `testing` |
| `scripts/server-install.sh` | Modify | Support `GRAV_CHANNEL_SUFFIX` for `?testing` query param on 2.0 RC download | | `scripts/server-install.sh` | Modify | Support `GRAV_CHANNEL_SUFFIX` for `?testing` query param on 2.0 RC download |
@@ -154,8 +156,9 @@ Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>"
## Task 2: Add Grav 2.0 compat flag and switch GPM to testing channel ## Task 2: Add Grav 2.0 compat flag and switch GPM to testing channel
**Files:** **Files:**
- Create: `user/plugins/cache-on-save/blueprints.yaml` - Modify: `.gitignore` (add exception for `user/plugins/cache-on-save/`)
- Modify: `user/config/system.yaml` (line ~200, `gpm:` section) - Create: `user/plugins/cache-on-save/blueprints.yaml` (committed to main repo)
- Modify: `user/config/system.yaml` (committed to user/ git repo, not main repo)
**Interfaces:** **Interfaces:**
- Consumes: Running container from Task 1 - Consumes: Running container from Task 1
@@ -199,12 +202,28 @@ gpm:
official_gpm_only: true official_gpm_only: true
``` ```
- [ ] **Step 3: Commit to user/ repo and main repo** - [ ] **Step 3: Add gitignore exception and commit blueprints.yaml to main repo**
```bash ```bash
cd /home/mischa/Nextcloud/Projects/travel-blog-intotheeast cd /home/mischa/Nextcloud/Projects/travel-blog-intotheeast
git add user/plugins/cache-on-save/blueprints.yaml user/config/system.yaml
git commit -m "feat: add Grav 2.0 compat flag and switch GPM to testing channel # Add exception so cache-on-save is tracked in the main repo
# Insert after the existing "user/plugins/" line in .gitignore:
# !user/plugins/cache-on-save/
# Then commit to the main repo:
git add .gitignore user/plugins/cache-on-save/blueprints.yaml
git commit -m "feat: track cache-on-save plugin in main repo; add Grav 2.0 compat flag
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>"
```
- [ ] **Step 4: Commit system.yaml to the user/ git repo**
```bash
cd /home/mischa/Nextcloud/Projects/travel-blog-intotheeast
git -C user add config/system.yaml
git -C user commit -m "feat: switch GPM to testing channel for Grav 2.0
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>" Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>"
``` ```