From 3403f4af09301f0c1f37f802e2359a87bad241db Mon Sep 17 00:00:00 2001 From: Christopher Date: Wed, 10 Jul 2024 12:18:28 +0100 Subject: [PATCH 1/2] Add sample_rate to sentry setup --- app/settings/common.py | 1 + 1 file changed, 1 insertion(+) diff --git a/app/settings/common.py b/app/settings/common.py index a9edb1eb..4dcd3f9e 100644 --- a/app/settings/common.py +++ b/app/settings/common.py @@ -69,6 +69,7 @@ DjangoIntegration(), ], enable_tracing=True, + sample_rate=0.01, ) # Quick-start development settings - unsuitable for production From cd0a9d5c4b6187419da763099b7bf7fe04ae932a Mon Sep 17 00:00:00 2001 From: Christopher Date: Wed, 10 Jul 2024 12:20:14 +0100 Subject: [PATCH 2/2] Add new action for govpaas branch --- .../update-migration-branch-from-govpaas.yml | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 .github/workflows/update-migration-branch-from-govpaas.yml diff --git a/.github/workflows/update-migration-branch-from-govpaas.yml b/.github/workflows/update-migration-branch-from-govpaas.yml new file mode 100644 index 00000000..027e9817 --- /dev/null +++ b/.github/workflows/update-migration-branch-from-govpaas.yml @@ -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 "" + + + - 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 \ No newline at end of file