Skip to content
This repository was archived by the owner on Jun 25, 2024. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 23 additions & 0 deletions .github/workflows/branch_release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
---
# Workflow to automate creation and updating of release branches
name: Release Branching

# Trigger on tags created by TeamCity
on:
push:
tags:
- '*'

jobs:
branch_release:
if: github.event.created && github.event.sender.login == 'labkey-teamcity'
runs-on: ubuntu-latest

steps:
- name: Checkout
uses: actions/checkout@v2

- name: Create branches and PRs
uses: LabKey/gitHubActions/branch-release@master
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
28 changes: 28 additions & 0 deletions .github/workflows/merge_release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
---
# Workflow to automate merging release branches
name: Release Merging

# Trigger on PR approval
on:
pull_request_review:
types:
- submitted

jobs:
merge_release:
if: >
github.event.review.state == 'approved' &&
github.event.pull_request.user.login == 'github-actions[bot]'
runs-on: ubuntu-latest

steps:
- name: Checkout
uses: actions/checkout@v2

- name: Merge PR
uses: LabKey/gitHubActions/merge-release@master
with:
target_branch: ${{ github.event.pull_request.base.ref }}
merge_branch: ${{ github.event.pull_request.head.ref }}
pr_number: ${{ github.event.pull_request.number }}
github_token: ${{ secrets.GITHUB_TOKEN }}