Skip to content

Commit

Permalink
Merge pull request #869 from keymanapp/chore/merge-master-to-staging-…
Browse files Browse the repository at this point in the history
…a17s25

chore: Merge master to staging for Sprint A17S25
  • Loading branch information
darcywong00 authored Nov 9, 2023
2 parents e32a766 + 5bb0fda commit a80a2f4
Show file tree
Hide file tree
Showing 41 changed files with 14,805 additions and 60 deletions.
30 changes: 30 additions & 0 deletions .github/workflows/auto-approve-and-merge-keyman-server-pr.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
#
# Automatically approves and queues for merge any pull requests with a branch
# name starting with auto/, that are opened by keyman-server. This action is
# used to merge product help documentation from keymanapp/keyman and also for
# keyboard documentation PRs.
#
name: Auto Approve and Merge PRs from keyman-server

on: pull_request_target

jobs:
auto-approve:
if: github.actor == 'keyman-server' && startsWith(github.head_ref, 'auto/')
runs-on: ubuntu-latest
env:
GH_TOKEN: ${{ secrets.AUTO_PR_APPROVAL_BY_KEYMAN_STATUS }}
permissions: write-all
steps:
- name: Checkout
uses: actions/[email protected]
with:
sparse-checkout: |
README.md
sparse-checkout-cone-mode: false
- name: Approve pull request
run: |
gh pr review --approve ${{github.head_ref}}
- name: Enable auto-merge
run: |
gh pr merge --merge --auto ${{github.head_ref}}
20 changes: 0 additions & 20 deletions .github/workflows/auto-approve-keyman-server-pr.yml

This file was deleted.

40 changes: 0 additions & 40 deletions .github/workflows/auto-merge-keyman-server-pr.yml

This file was deleted.

Loading

0 comments on commit a80a2f4

Please sign in to comment.