Merge branch 'staging'

.github/pull_request_template.md

@@ -0,0 +1,5 @@
+PR Checklist
+- [ ] Includes changes to desk files
+- [ ] Describes how you tested the PR locally (test ship vs livenet)
+- [ ] If a new feature, includes automated tests
+- [ ] Comments added anywhere logic may be confusing without context

.github/workflows/bump.yml

@@ -19,7 +19,6 @@ jobs:
       - uses: actions/checkout@v3
         with:
           ref: ${{ github.event.inputs.tag }}
-          token: ${{ secrets.REPO_TOKEN }}
       - name: Bump
         run: |
           sed -i "s/version+\[.*]/version+[${{ github.event.inputs.version }}]/" desk/desk.docket-0

.github/workflows/deploy-canary-groups.yml

@@ -6,6 +6,10 @@ on:
         type: string
         required: false
         description: Enter the tag to deploy
+        default: staging
+  push:
+    branches:
+      - 'staging'
 jobs:
   deploy:
     runs-on: ubuntu-latest

.github/workflows/deploy-canary-talk.yml

@@ -6,6 +6,10 @@ on:
         type: string
         required: false
         description: Enter the tag to deploy
+        default: staging
+  push:
+    branches:
+      - 'staging'
 jobs:
   deploy:
     runs-on: ubuntu-latest

.github/workflows/deploy-groups.yml

@@ -17,7 +17,6 @@ jobs:
     steps:
       - uses: actions/checkout@v3
         with:
-          token: ${{ secrets.REPO_TOKEN }}
           ref: ${{ github.event.inputs.tag }}
       - uses: actions/setup-node@v3
         with:
@@ -37,7 +36,6 @@ jobs:
     steps:
       - uses: actions/checkout@v3
         with:
-          token: ${{ secrets.REPO_TOKEN }}
           ref: ${{ github.event.inputs.tag }}
       - uses: actions/download-artifact@v3
         with:
@@ -71,7 +69,6 @@ jobs:
     steps:
       - uses: actions/checkout@v3
         with:
-          token: ${{ secrets.REPO_TOKEN }}
           ref: ${{ github.event.inputs.tag }}
       - id: 'auth'
         uses: 'google-github-actions/auth@v1'

.github/workflows/deploy-kernel-groups.yml

@@ -14,7 +14,6 @@ jobs:
     steps:
       - uses: actions/checkout@v3
         with:
-          token: ${{ secrets.REPO_TOKEN }}
           ref: ${{ github.event.inputs.tag }}
       - id: 'auth'
         uses: 'google-github-actions/auth@v1'

.github/workflows/deploy-kernel-talk.yml

@@ -14,7 +14,6 @@ jobs:
     steps:
       - uses: actions/checkout@v3
         with:
-          token: ${{ secrets.REPO_TOKEN }}
           ref: ${{ github.event.inputs.tag }}
       - id: 'auth'
         uses: 'google-github-actions/auth@v1'

.github/workflows/deploy-talk.yml

@@ -17,7 +17,6 @@ jobs:
     steps:
       - uses: actions/checkout@v3
         with:
-          token: ${{ secrets.REPO_TOKEN }}
           ref: ${{ github.event.inputs.tag }}
       - uses: actions/setup-node@v3
         with:
@@ -37,7 +36,6 @@ jobs:
     steps:
       - uses: actions/checkout@v3
         with:
-          token: ${{ secrets.REPO_TOKEN }}
           ref: ${{ github.event.inputs.tag }}
       - uses: actions/download-artifact@v3
         with:
@@ -72,7 +70,6 @@ jobs:
     steps:
       - uses: actions/checkout@v3
         with:
-          token: ${{ secrets.REPO_TOKEN }}
           ref: ${{ github.event.inputs.tag }}
       - id: 'auth'
         uses: 'google-github-actions/auth@v1'

.github/workflows/glob-and-deploy-kernel-groups.yml

@@ -14,7 +14,6 @@ jobs:
     steps:
       - uses: actions/checkout@v3
         with:
-          token: ${{ secrets.REPO_TOKEN }}
           ref: ${{ github.event.inputs.tag }}
       - uses: actions/setup-node@v3
         with:
@@ -34,7 +33,6 @@ jobs:
     steps:
       - uses: actions/checkout@v3
         with:
-          token: ${{ secrets.REPO_TOKEN }}
           ref: ${{ github.event.inputs.tag }}
       - uses: actions/download-artifact@v3
         with:
@@ -68,7 +66,6 @@ jobs:
     steps:
       - uses: actions/checkout@v3
         with:
-          token: ${{ secrets.REPO_TOKEN }}
           ref: ${{ github.event.inputs.tag }}
       - id: 'auth'
         uses: 'google-github-actions/auth@v1'

.github/workflows/glob-and-deploy-kernel-talk.yml

@@ -14,7 +14,6 @@ jobs:
     steps:
       - uses: actions/checkout@v3
         with:
-          token: ${{ secrets.REPO_TOKEN }}
           ref: ${{ github.event.inputs.tag }}
       - uses: actions/setup-node@v3
         with:
@@ -34,7 +33,6 @@ jobs:
     steps:
       - uses: actions/checkout@v3
         with:
-          token: ${{ secrets.REPO_TOKEN }}
           ref: ${{ github.event.inputs.tag }}
       - uses: actions/download-artifact@v3
         with:
@@ -69,7 +67,6 @@ jobs:
     steps:
       - uses: actions/checkout@v3
         with:
-          token: ${{ secrets.REPO_TOKEN }}
           ref: ${{ github.event.inputs.tag }}
       - id: 'auth'
         uses: 'google-github-actions/auth@v1'

.github/workflows/playwright.yml

@@ -12,7 +12,7 @@ jobs:
     - uses: actions/checkout@v3
     - uses: actions/setup-node@v3
       with:
-        node-version: 16
+        node-version: 20
     - name: Install dependencies
       run: npm ci
     - name: Install Playwright Browsers

.github/workflows/sync.yml

@@ -10,18 +10,16 @@ jobs:
     name: "Syncs the latest livenet deploy from develop to master"
     steps:
       - uses: actions/checkout@v3
-        with:
-          token: ${{ secrets.REPO_TOKEN }}
       - name: Set Git config
         run: |
           git config --local user.email "[email protected]"
           git config --local user.name "Github Actions"
       - name: Merge Dev to Master
         run: |
           git fetch --unshallow
-          git checkout develop
+          git checkout staging
           git pull
           git checkout master
           git pull
-          git merge --no-ff develop
+          git merge --no-ff staging
           git push

DEVELOPMENT.md

@@ -29,7 +29,7 @@ To get started, make sure your %groups desk is mounted:
 Sync the latest %groups files:
 
 ```
-rsync -avL --delete desk/* ~/urbit/zod/groups/
+rsync -avL desk/* ~/urbit/zod/groups/
 ```
 
 And commit: