Upstream/bitwarden-browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser.git synced 2025-02-16 01:21:48 +01:00
Code Issues Projects Releases Wiki Activity

[DEVOPS-1421] fix auto branch updater (#5710)

Browse Source 
* [DEVOPS-1421] Fix syntax error

* add a fetch-depth to fetch the branches

* Add the relative repo name to the branch being merged

* remove testing branch
This commit is contained in:
Joseph Flinn 2023-06-29 08:36:53 -07:00 committed by GitHub
parent a009ca3cfa
commit e615a2cd09
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.github/workflows/auto-branch-updater.yml vendored
View File

@ -6,7 +6,6 @@ on:
branches: branches:
- 'master' - 'master'
- 'rc' - 'rc'
- 'DEVOPS-1421_auto-branch-updater-test'
paths: paths:
- 'apps/web/**' - 'apps/web/**'
- 'libs/**' - 'libs/**'
@ -27,16 +26,17 @@ jobs:
steps: steps:
- name: Setup - name: Setup
id: setup id: setup
run: echo "branch=${GITHUB_REF#/refs/heads/}" >> $GITHUB_OUTPUT run: echo "branch=${GITHUB_REF#refs/heads/}" >> $GITHUB_OUTPUT
- name: Checkout repo - name: Checkout repo
uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3 uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
with: with:
ref: 'eu-web-${{ steps.setup.outputs.branch }}' ref: 'eu-web-${{ steps.setup.outputs.branch }}'
fetch-depth: 0
- name: Merge ${{ steps.setup.outputs.branch }} - name: Merge ${{ steps.setup.outputs.branch }}
run: | run: |
git config --local user.email "${{ env._BOT_EMAIL }}" git config --local user.email "${{ env._BOT_EMAIL }}"
git config --local user.name "${{ env._BOT_NAME }}" git config --local user.name "${{ env._BOT_NAME }}"
git merge ${{ steps.setup.outputs.branch }} git merge origin/${{ steps.setup.outputs.branch }}
git push git push