Skip to content

Commit 2eaf32f

Browse files
author
Isa Farnik
authored
Merge pull request #76 from LabKey/fb_actionsDevelop
Rename action branch to develop
2 parents dd9a63e + 7ed75f5 commit 2eaf32f

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

.github/workflows/branch_release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,6 @@ jobs:
1818
uses: actions/checkout@v2
1919

2020
- name: Create branches and PRs
21-
uses: LabKey/gitHubActions/branch-release@master
21+
uses: LabKey/gitHubActions/branch-release@develop
2222
with:
2323
github_token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/merge_release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
uses: actions/checkout@v2
2121

2222
- name: Merge PR
23-
uses: LabKey/gitHubActions/merge-release@master
23+
uses: LabKey/gitHubActions/merge-release@develop
2424
with:
2525
target_branch: ${{ github.event.pull_request.base.ref }}
2626
merge_branch: ${{ github.event.pull_request.head.ref }}

.github/workflows/sync-repos.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Designed to keep develop branch as a perfect copy of LabKey fork
1+
# Designed to keep master branch as a perfect copy of LabKey fork
22
name: Sync Repos
33

44
on:
@@ -19,14 +19,14 @@ jobs:
1919
destination_branch_prefix: "discvr-"
2020
# NOTE: permissions are limited on the default secrets.GITHUB_TOKEN, including updating workflows, so use a personal access token
2121
github_token: ${{ secrets.PAT }}
22-
sync-develop:
22+
sync-master:
2323
if: github.repository == 'BimberLabInternal/LabDevKitModules'
2424
runs-on: ubuntu-latest
2525
steps:
2626
- name: "Sync Develop Branch"
2727
uses: bimberlabinternal/DevOps/githubActions/git-sync@master
2828
with:
2929
source_repo: "labkey/LabDevKitModules"
30-
source_branch: "develop"
31-
destination_branch: "develop"
30+
source_branch: "master"
31+
destination_branch: "master"
3232
github_token: ${{ secrets.PAT }}

.github/workflows/validate_pr.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717

1818
steps:
1919
- name: Validate PR Branches
20-
uses: labkey-tchad/gitHubActions/validate-pr@master
20+
uses: LabKey/gitHubActions/validate-pr@develop
2121
with:
2222
pr_base: ${{ github.event.pull_request.base.ref }}
2323
pr_head: ${{ github.event.pull_request.head.ref }}

0 commit comments

Comments
 (0)