From 0ca73e081257cdbe1650ff139b1f330c1a9c26be Mon Sep 17 00:00:00 2001
From: Mitchell Crompton <mitchell.crompton@tiny.cloud>
Date: Tue, 16 Apr 2024 14:44:29 +1000
Subject: [PATCH] DOC-2373: Update workflow versions for main branch (#3233)

* DOC-2373: Update workflow versions

* DOC-2373: Update repo PR template
---
 .github/pull_request_template.md  | 4 ++--
 .github/workflows/codeql.yml      | 9 +++------
 .github/workflows/deploy_docs.yml | 6 +++---
 3 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index 53e516f7c2..edbd0f50ac 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -1,12 +1,12 @@
 Ticket: DOC-<num>
 
-Site: [Staging branch](http://docs-<hotfix|feature>-7-doc-<num>.staging.tiny.cloud/docs/tinymce/latest/)
+Site: [Staging branch](http://docs-<hotfix|feature>-<version>-doc-<num>.staging.tiny.cloud/docs/tinymce/<version>/)
 
 Changes:
 * <placeholder-text>
 
 Pre-checks:
-- [ ] Branch prefixed with `feature/7/` or `hotfix/7/`
+- [ ] Branch prefixed with `feature/<version>/`, `hotfix/<version>/`, `staging/<version>/`, or `release/<version>/`
 - [ ] `modules/ROOT/nav.adoc` has been updated `(if applicable)`
 - [ ] Files has been included where required `(if applicable)`
 - [ ] Files removed have been deleted, not just excluded from the build `(if applicable)`
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index a69a57aabd..9eb7bd2f4f 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -2,12 +2,9 @@ name: "CodeQL"
 
 on:
   push:
-    branches: [ "feature/**", "hotfix/**", "staging/**", "release/**"  ]
+    branches: [ "feature/**", "hotfix/**", "staging/**", "release/**", "tinymce/**", "main"  ]
   pull_request:
-    branches: [ "staging/**", "release/**" ]
-## Add schedule if needed
-#  schedule:
-#    - cron: "17 23 * * 5"
+    branches: [ "main", "tinymce/**" ]
 
 jobs:
   analyze:
@@ -25,7 +22,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Initialize CodeQL
         uses: github/codeql-action/init@v2
diff --git a/.github/workflows/deploy_docs.yml b/.github/workflows/deploy_docs.yml
index f113411d5c..2e2b577198 100644
--- a/.github/workflows/deploy_docs.yml
+++ b/.github/workflows/deploy_docs.yml
@@ -18,17 +18,17 @@ jobs:
 
     if: github.repository == 'tinymce/tinymce-docs' && github.repository_owner == 'tinymce'
 
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
 
     strategy:
       matrix:
         node-version: [21]
 
     steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v4
 
     - name: Use Node.js
-      uses: actions/setup-node@v2
+      uses: actions/setup-node@v4
       with:
         cache: 'yarn'
         node-version: ${{ matrix.node-version }}