Skip to content

Commit

Permalink
DOC-2373: Update workflow versions for main branch (#3233)
Browse files Browse the repository at this point in the history
* DOC-2373: Update workflow versions

* DOC-2373: Update repo PR template
  • Loading branch information
MitchC1999 authored Apr 16, 2024
1 parent 1e2a897 commit 0ca73e0
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 11 deletions.
4 changes: 2 additions & 2 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -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)`
Expand Down
9 changes: 3 additions & 6 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/deploy_docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down

0 comments on commit 0ca73e0

Please sign in to comment.