Skip to content

Commit 5efada9

Browse files
authored
Merge branch 'main' into MPDX-6971
2 parents 3487a0e + 5e9ee72 commit 5efada9

141 files changed

Lines changed: 2012 additions & 1168 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/merge-pr-into-staging.yml

Lines changed: 0 additions & 18 deletions
This file was deleted.
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
name: Update staging
2+
on:
3+
push:
4+
branches:
5+
- main
6+
pull_request:
7+
types: [labeled, synchronize]
8+
9+
jobs:
10+
update-staging:
11+
runs-on: ubuntu-latest
12+
if: github.ref == 'refs/heads/main' || contains(github.event.pull_request.labels.*.name, 'On Staging')
13+
steps:
14+
- uses: actions/checkout@v2
15+
- name: 🖇️ Merge current branch into staging
16+
uses: devmasx/merge-branch@v1.3.1
17+
with:
18+
type: now
19+
target_branch: 'staging'
20+
github_token: ${{ github.token }}

.pnp.js

Lines changed: 88 additions & 56 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
82.2 KB
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

0 commit comments

Comments
 (0)