Skip to content

Commit 91eed49

Browse files
authored
Merge pull request #168 from keymanapp/master
Merge master to kmw-redev/mh
2 parents 55d8999 + 61806fb commit 91eed49

File tree

4 files changed

+87
-1
lines changed

4 files changed

+87
-1
lines changed

.github/multi-labeler.yml

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
version: v1
2+
3+
# This file adds labels based on the scopes in
4+
# keymanapp/keyman:resources/scopes/commit-types.json
5+
# Currently it must be manually kept up to date. Not all labels are added, only
6+
# common ones. The others are commented out.
7+
8+
9+
labels:
10+
#
11+
# conventional commit / semantic PR styles
12+
#
13+
14+
- label: 'auto'
15+
matcher:
16+
title: '^auto(\(|:)'
17+
- label: 'change'
18+
matcher:
19+
title: '^change(\(|:)'
20+
- label: 'chore'
21+
matcher:
22+
title: '^chore(\(|:)'
23+
- label: 'docs'
24+
matcher:
25+
title: '^docs(\(|:)'
26+
- label: 'feat'
27+
matcher:
28+
title: '^feat(\(|:)'
29+
- label: 'fix'
30+
matcher:
31+
title: '^fix(\(|:)'
32+
- label: 'maint'
33+
matcher:
34+
title: '^maint(\(|:)'
35+
- label: 'refactor'
36+
matcher:
37+
title: '^refactor(\(|:)'
38+
- label: 'style'
39+
matcher:
40+
title: '^style(\(|:)'
41+
- label: 'test'
42+
matcher:
43+
title: '^test(\(|:)'
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
#
2+
# Automatically approves and queues for merge any pull requests with a branch
3+
# name starting with auto/, that are opened by keyman-server.
4+
#
5+
name: Auto Approve and Merge PRs from keyman-server
6+
7+
on: pull_request_target
8+
9+
jobs:
10+
auto-approve:
11+
if: github.actor == 'keyman-server' && startsWith(github.head_ref, 'auto/')
12+
runs-on: ubuntu-latest
13+
env:
14+
GH_TOKEN: ${{ secrets.AUTO_PR_APPROVAL_BY_KEYMAN_STATUS }}
15+
permissions: write-all
16+
steps:
17+
- name: Checkout
18+
uses: actions/checkout@v4.1.5
19+
with:
20+
sparse-checkout: |
21+
README.md
22+
sparse-checkout-cone-mode: false
23+
- name: Approve pull request
24+
run: |
25+
gh pr review --approve ${{github.head_ref}}
26+
- name: Enable auto-merge
27+
run: |
28+
gh pr merge --merge --auto ${{github.head_ref}}

.github/workflows/labeler.yml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
name: "Pull Request Labeler"
2+
on:
3+
- pull_request
4+
5+
jobs:
6+
triage:
7+
if: github.repository == 'keymanapp/keymanweb.com'
8+
runs-on: ubuntu-latest
9+
steps:
10+
- name: Update labels based on PR title
11+
id: labeler
12+
uses: fuxingloh/multi-labeler@f5bd7323b53b0833c1e4ed8d7b797ae995ef75b4 # v2.0.1
13+
with:
14+
github-token: ${{secrets.GITHUB_TOKEN}}
15+
config-path: .github/multi-labeler.yml

build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
## START STANDARD SITE BUILD SCRIPT INCLUDE
33
readonly THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
44
readonly BOOTSTRAP="$(dirname "$THIS_SCRIPT")/resources/bootstrap.inc.sh"
5-
readonly BOOTSTRAP_VERSION=v1.0.2
5+
readonly BOOTSTRAP_VERSION=v1.0.6
66
[ -f "$BOOTSTRAP" ] && source "$BOOTSTRAP" || source <(curl -H "Cache-Control: no-cache" -fs https://raw.githubusercontent.com/keymanapp/shared-sites/$BOOTSTRAP_VERSION/bootstrap.inc.sh)
77
## END STANDARD SITE BUILD SCRIPT INCLUDE
88

0 commit comments

Comments
 (0)