diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 3e4352b3b..8322900f1 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -30,6 +30,7 @@ jobs: gitRef: ${{ inputs.gitRef || github.event.release.tag_name }} permissions: id-token: write + contents: read trigger-deploy: name: Trigger deploy to ${{ inputs.environment || 'integration' }} needs: build-and-publish-image diff --git a/.govuk_dependabot_merger.yml b/.govuk_dependabot_merger.yml new file mode 100644 index 000000000..b034b839c --- /dev/null +++ b/.govuk_dependabot_merger.yml @@ -0,0 +1,30 @@ +api_version: 1 +auto_merge: + - dependency: gds-api-adapters + allowed_semver_bumps: + - patch + - minor + - dependency: govuk_app_config + allowed_semver_bumps: + - patch + - minor + - dependency: govuk_publishing_components + allowed_semver_bumps: + - patch + - minor + - dependency: govuk_sidekiq + allowed_semver_bumps: + - patch + - minor + - dependency: govuk_test + allowed_semver_bumps: + - patch + - minor + - dependency: plek + allowed_semver_bumps: + - patch + - minor + - dependency: rubocop-govuk + allowed_semver_bumps: + - patch + - minor diff --git a/Gemfile.lock b/Gemfile.lock index 32372c9e9..4880e3088 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -363,7 +363,7 @@ GEM opentelemetry-instrumentation-base (0.22.3) opentelemetry-api (~> 1.0) opentelemetry-registry (~> 0.1) - opentelemetry-instrumentation-bunny (0.21.1) + opentelemetry-instrumentation-bunny (0.21.2) opentelemetry-api (~> 1.0) opentelemetry-instrumentation-base (~> 0.22.1) opentelemetry-instrumentation-concurrent_ruby (0.21.2) @@ -454,7 +454,7 @@ GEM opentelemetry-api (~> 1.0) opentelemetry-common (~> 0.20.0) opentelemetry-instrumentation-base (~> 0.22.1) - opentelemetry-instrumentation-resque (0.5.0) + opentelemetry-instrumentation-resque (0.5.1) opentelemetry-api (~> 1.0) opentelemetry-instrumentation-base (~> 0.22.1) opentelemetry-instrumentation-restclient (0.22.3)