Add display of marks earned in the last 24 hours in addition to the total marks, and enhancements to Canvas #9780
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
# auto merge any pr that | |
# 1. has ` [bot]` at the end of the pr title | |
# 2. has `automerge` and `automerge-merge` label | |
# note the first character in ` [bot]` is a thin space https://www.wikiwand.com/en/Thin_space | |
name: Auto Merge | |
on: | |
pull_request: | |
branches: | |
- mainnet | |
- sepolia | |
types: | |
- labeled | |
- synchronize | |
- opened | |
- edited | |
- ready_for_review | |
- reopened | |
- unlocked | |
pull_request_review: | |
types: | |
- submitted | |
status: {} | |
jobs: | |
# merge with WRITE_TOKEN so that subsequent actions can be triggered | |
# merge with merge instead of squash | |
automerge-merge: | |
if: | | |
endsWith(github.event.pull_request.title, ' [bot]') && | |
!( | |
github.head_ref == 'mainnet' && | |
github.base_ref == 'sepolia' | |
) | |
runs-on: ubuntu-latest | |
steps: | |
- id: automerge-merge | |
name: automerge-merge | |
uses: pascalgn/automerge-action@22948e0bc22f0aa673800da838595a3e7347e584 | |
env: | |
GITHUB_TOKEN: "${{ secrets.WRITE_TOKEN }}" | |
MERGE_METHOD: "merge" | |
MERGE_LABELS: "automerge, automerge-merge" | |
MERGE_REMOVE_LABELS: "automerge, automerge-merge" | |
MERGE_COMMIT_MESSAGE: "Auto merge #{pullRequest.number} [bot]" |