FilesExpand file tree

develop

/

sync-main-to-develop.yml

Copy path

View runs

Blame

More file actions

Blame

More file actions

Latest commit

 

History

History

History

56 lines (50 loc) · 1.6 KB

develop

/

sync-main-to-develop.yml

Copy path

Top

File metadata and controls

• Code
• Blame

56 lines (50 loc) · 1.6 KB

Raw

Copy raw file

Download raw file

Open symbols panel

Edit and raw actions

1

2

3

4

5

6

7

8

9

10

11

12

13

14

15

16

17

18

19

20

21

22

23

24

25

26

27

28

29

30

31

32

33

34

35

36

37

38

39

40

41

42

43

44

45

46

47

48

49

50

51

52

53

54

55

56

name: Sync main to develop

# Keeps stable hotfix commits reachable from the integration branch after the

# production source of truth publishes successfully.

on:

workflow_run:

workflows:

- Release

types:

- completed

branches:

- main

workflow_dispatch:

permissions:

contents: read

concurrency:

group: sync-main-to-develop

cancel-in-progress: false

jobs:

sync:

name: Merge main into develop

if: github.event_name == 'workflow_dispatch' || github.event.workflow_run.conclusion == 'success'

runs-on: ubuntu-latest

timeout-minutes: 10

permissions:

contents: write

steps:

- id: app-token

uses: actions/create-github-app-token@bcd2ba49218906704ab6c1aa796996da409d3eb1 # v3.2.0

with:

client-id: ${{ vars.GH_APP_CLIENT_ID }}

private-key: ${{ secrets.GH_APP_PRIVATE_KEY }}

permission-contents: write

- uses: useblacksmith/checkout@c9796daa2a4bdebdab5bd16be2c09a70cd4e1121 # v1

with:

ref: develop

fetch-depth: 0

persist-credentials: true

token: ${{ steps.app-token.outputs.token }}

- name: Merge main into develop

run: |

set -euo pipefail

git config user.name "github-actions[bot]"

git config user.email "41898282+github-actions[bot]@users.noreply.github.com"

git fetch origin main develop

if git merge-base --is-ancestor origin/main HEAD; then

echo "develop already contains main."

else

git merge origin/main --no-edit

git push origin develop

fi