Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/govuk-paas-deploy' into migratio…
Browse files Browse the repository at this point in the history
…n-deploy
  • Loading branch information
GitHub Action authored and GitHub Action committed Jul 10, 2024
2 parents 09a48ff + d01db55 commit 5a8cd17
Show file tree
Hide file tree
Showing 3 changed files with 37 additions and 2 deletions.
34 changes: 34 additions & 0 deletions .github/workflows/update-migration-branch-from-govpaas.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
name: Update Migration Branch

on:
pull_request:
types:
- closed

permissions:
contents: write

jobs:
sync:
if: github.event.pull_request.merged == true
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4
with:
fetch-depth: 0

- name: Setup Git User
run: |
git config user.name "GitHub Action"
git config user.email "<EMAIL>"

- name: Update Migration Branch
run: |
git checkout govuk-paas-deploy
git fetch origin
git checkout migration-deploy
git pull
git merge origin/govuk-paas-deploy
git push origin migration-deploy
3 changes: 2 additions & 1 deletion CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
* @uktrade/datahub
# * @uktrade/datahub
* @cgsunkel @marijnkampf @p3dr0migue1 @DeanElliott96 @bau123
2 changes: 1 addition & 1 deletion src/client/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ if (globalProps.sentryDsn) {
],
}),
],
tracesSampleRate: 1.0,
tracesSampleRate: 0.01,
})
}

Expand Down

0 comments on commit 5a8cd17

Please sign in to comment.