Merge branch '3.0' into 3

# Conflicts: # .github/workflows/merge-up.yml
bringyourownideas · Aug 29, 2023 · a3ce3e5 · a3ce3e5
2 parents 3e92be8 + fec386b
commit a3ce3e5
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 2 deletions.
diff --git a/.github/workflows/merge-up.yml b/.github/workflows/merge-up.yml
@@ -1,9 +1,9 @@
 name: Merge-up
 
 on:
-  # At 4:15 PM UTC, only on Thursday
+  # At 8:40 PM UTC, only on Sunday
   schedule:
-    - cron: '15 16 * * 4'
+    - cron: '40 20 * * 0'
   workflow_dispatch:
 
 jobs:

diff --git a/.github/workflows/update-js.yml b/.github/workflows/update-js.yml
@@ -0,0 +1,17 @@
+name: Update JS
+
+on:
+  workflow_dispatch:
+  # Run on a schedule of once per quarter
+  schedule:
+    - cron: '40 20 1 */3 *'
+
+jobs:
+  update-js:
+    name: Update JS
+    # Only run cron on the bringyourownideas account
+    if: (github.event_name == 'schedule' && github.repository_owner == 'bringyourownideas') || (github.event_name != 'schedule')
+    runs-on: ubuntu-latest
+    steps:
+      - name: Update JS
+        uses: silverstripe/gha-update-js@v1