From c1c27b7fecdc9b9b4354952b7cca0203b7b28619 Mon Sep 17 00:00:00 2001
From: Eric Theise <erictheise@gmail.com>
Date: Sat, 13 Jul 2024 14:17:46 -0700
Subject: [PATCH] Part of
 https://github.com/OpenHistoricalMap/issues/issues/786, dropping matrix
 strategy, upgrading action versions.

---
 .github/workflows/node.js.yml           | 6 +++---
 .github/workflows/ohm.deploy.yml        | 5 +----
 .github/workflows/ohm.tests.yml         | 5 +----
 .github/workflows/ohm.upstream-sync.yml | 7 ++-----
 4 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml
index 8f50a2ee..c81ecd1d 100644
--- a/.github/workflows/node.js.yml
+++ b/.github/workflows/node.js.yml
@@ -13,10 +13,10 @@ jobs:
       contents: write
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         with:
-          node-version: "20"
+          node-version: "20.x"
       - run: corepack enable
       - run: yarn install
       - run: yarn test
diff --git a/.github/workflows/ohm.deploy.yml b/.github/workflows/ohm.deploy.yml
index 0a866f8c..e8f47851 100644
--- a/.github/workflows/ohm.deploy.yml
+++ b/.github/workflows/ohm.deploy.yml
@@ -11,15 +11,12 @@ jobs:
     permissions:
       pages: write
       contents: write
-    strategy:
-      matrix:
-        node-version: ["18.x", "20.x"]
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v4
         with:
-          node-version: ${{ matrix.node-version }}
+          node-version: "20.x"
       - run: corepack enable
       - run: yarn install
       - run: yarn build
diff --git a/.github/workflows/ohm.tests.yml b/.github/workflows/ohm.tests.yml
index e99a938c..d5dcc9c9 100644
--- a/.github/workflows/ohm.tests.yml
+++ b/.github/workflows/ohm.tests.yml
@@ -7,15 +7,12 @@ on:
 
 jobs:
   test:
-    strategy:
-      matrix:
-        node-version: ["18.x", "20.x"]
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v4
         with:
-          node-version: ${{ matrix.node-version }}
+          node-version: "20.x"
       - run: corepack enable
       - run: yarn install
       - run: yarn test
diff --git a/.github/workflows/ohm.upstream-sync.yml b/.github/workflows/ohm.upstream-sync.yml
index da42e561..4c713d68 100644
--- a/.github/workflows/ohm.upstream-sync.yml
+++ b/.github/workflows/ohm.upstream-sync.yml
@@ -1,11 +1,8 @@
 name: OHM Upstream Sync
 
 on:
-  push:
-    branches:
-      - main
   schedule:
-    - cron: "20 5,17 * * *"
+    - cron: "34 12 * * *"
   workflow_dispatch:
 
 jobs:
@@ -37,7 +34,7 @@ jobs:
 
       - name: List all branches
         run: |
-          git branch --all | egrep 'main|master|sacrifice'
+          git branch --all | egrep 'main|master|sacrifice|candidate'
 
       - name: Check out upstream master
         env: