Skip to content

Commit

Permalink
Merge pull request #128 from UMM-CSci-3601/add-merge-group-to-workflow
Browse files Browse the repository at this point in the history
Add `merge_group` to all the workflow files
  • Loading branch information
NicMcPhee authored Jan 15, 2024
2 parents 1656641 + b141289 commit 3cae399
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 22 deletions.
1 change: 1 addition & 0 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ name: "CodeQL"
on:
push:
pull_request:
merge_group:
schedule:
- cron: "21 0 10 * *"

Expand Down
29 changes: 14 additions & 15 deletions .github/workflows/gradle.yaml
Original file line number Diff line number Diff line change
@@ -1,23 +1,22 @@
name: Java

on: [push]
on: [push, pull_request, merge_group]

jobs:
build:

runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v1
- name: Cache Gradle artifacts (downloaded JARs, the wrapper, and any downloaded JDKs)
uses: actions/cache@v2
with:
path: |
~/.gradle/caches
~/.gradle/wrapper
~/.gradle/jdks
key: ${{ runner.os }}-gradle-${{ hashFiles('**/.gradle/') }}
restore-keys: |
${{ runner.os }}-gradle-
- name: Build with Gradle (which runs the tests as one of its subtasks)
run: ./gradlew build
- uses: actions/checkout@v1
- name: Cache Gradle artifacts (downloaded JARs, the wrapper, and any downloaded JDKs)
uses: actions/cache@v2
with:
path: |
~/.gradle/caches
~/.gradle/wrapper
~/.gradle/jdks
key: ${{ runner.os }}-gradle-${{ hashFiles('**/.gradle/') }}
restore-keys: |
${{ runner.os }}-gradle-
- name: Build with Gradle (which runs the tests as one of its subtasks)
run: ./gradlew build
14 changes: 7 additions & 7 deletions .github/workflows/link-check.yaml
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
name: Check Markdown links

on: [push]
on: [push, pull_request, merge_group]

jobs:
markdown-link-check:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@master
- uses: gaurav-nelson/github-action-markdown-link-check@v1
with:
use-quiet-mode: 'yes'
use-verbose-mode: 'yes'
config-file: '.github/mlc_config.json'
- uses: actions/checkout@master
- uses: gaurav-nelson/github-action-markdown-link-check@v1
with:
use-quiet-mode: "yes"
use-verbose-mode: "yes"
config-file: ".github/mlc_config.json"

0 comments on commit 3cae399

Please sign in to comment.