diff --git a/.github/workflows/docker_build.yml b/.github/workflows/docker_build.yml index d1ecad671..f5403695c 100644 --- a/.github/workflows/docker_build.yml +++ b/.github/workflows/docker_build.yml @@ -8,4 +8,4 @@ on: types: [checks_requested] jobs: build-image: - uses: alphagov/forms-deploy/.github/workflows/reusable-build-image.yml@main + uses: govuk-forms/forms-deploy/.github/workflows/reusable-build-image.yml@main diff --git a/.github/workflows/lint_workflows.yml b/.github/workflows/lint_workflows.yml index f55a7be6e..2337fd3cd 100644 --- a/.github/workflows/lint_workflows.yml +++ b/.github/workflows/lint_workflows.yml @@ -9,4 +9,4 @@ on: jobs: lint-workflows: - uses: alphagov/forms-deploy/.github/workflows/reusable-lint-workflows.yml@main + uses: govuk-forms/forms-deploy/.github/workflows/reusable-lint-workflows.yml@main diff --git a/.github/workflows/require-pinned-github-actions.yml b/.github/workflows/require-pinned-github-actions.yml index 791f6aa82..010396e52 100644 --- a/.github/workflows/require-pinned-github-actions.yml +++ b/.github/workflows/require-pinned-github-actions.yml @@ -8,4 +8,4 @@ on: jobs: check-actions-sha: name: Check actions are pinned to SHAs - uses: alphagov/forms-deploy/.github/workflows/require-pinned-github-actions.yml@main + uses: govuk-forms/forms-deploy/.github/workflows/require-pinned-github-actions.yml@main diff --git a/.github/workflows/review_apps_on_pr_change.yml b/.github/workflows/review_apps_on_pr_change.yml index cf8fe0ae4..7ff187f66 100644 --- a/.github/workflows/review_apps_on_pr_change.yml +++ b/.github/workflows/review_apps_on_pr_change.yml @@ -15,6 +15,6 @@ permissions: jobs: update-review-app: name: Update review app - uses: alphagov/forms-deploy/.github/workflows/reusable-review_apps_on_pr_change.yml@main + uses: govuk-forms/forms-deploy/.github/workflows/reusable-review_apps_on_pr_change.yml@main with: app-name: forms-runner diff --git a/.github/workflows/review_apps_on_pr_close.yml b/.github/workflows/review_apps_on_pr_close.yml index a3712ca38..15d3dfb83 100644 --- a/.github/workflows/review_apps_on_pr_close.yml +++ b/.github/workflows/review_apps_on_pr_close.yml @@ -15,6 +15,6 @@ permissions: jobs: delete-review-app: name: Delete review app - uses: alphagov/forms-deploy/.github/workflows/reusable-review_apps_on_pr_close.yml@main + uses: govuk-forms/forms-deploy/.github/workflows/reusable-review_apps_on_pr_close.yml@main with: app-name: forms-runner diff --git a/.github/workflows/trello_poster.yml b/.github/workflows/trello_poster.yml index 7fca07124..34a6dde17 100644 --- a/.github/workflows/trello_poster.yml +++ b/.github/workflows/trello_poster.yml @@ -4,7 +4,7 @@ on: types: [opened, edited] jobs: trello-poster: - uses: alphagov/forms-deploy/.github/workflows/trello-poster.yml@main + uses: govuk-forms/forms-deploy/.github/workflows/trello-poster.yml@main secrets: TRELLO_API_TOKEN: ${{ secrets.TRELLO_API_TOKEN }} TRELLO_API_KEY: ${{ secrets.TRELLO_API_KEY }} diff --git a/.review_apps/site.tf b/.review_apps/site.tf index 03d66772f..ad6aea7b7 100644 --- a/.review_apps/site.tf +++ b/.review_apps/site.tf @@ -28,8 +28,8 @@ provider "aws" { default_tags { tags = { Environment = "review" - Deployment = "github.com/alphagov/forms-admin/.review_apps" - PullRequest = "https://github.com/alphagov/forms-admin/pull/${var.pull_request_number}" + Deployment = "github.com/govuk-forms/forms-admin/.review_apps" + PullRequest = "https://github.com/govuk-forms/forms-admin/pull/${var.pull_request_number}" } } } diff --git a/Gemfile b/Gemfile index 115e2d107..c48fefb08 100644 --- a/Gemfile +++ b/Gemfile @@ -49,7 +49,7 @@ gem "govuk-components", "~> 6" gem "govuk_design_system_formbuilder", "~> 6" # Our own custom markdown renderer -gem "govuk-forms-markdown", github: "alphagov/govuk-forms-markdown", tag: "0.8.0" +gem "govuk-forms-markdown", github: "govuk-forms/govuk-forms-markdown", tag: "0.8.0" # For compiling our frontend assets gem "vite_rails" diff --git a/README.md b/README.md index 36c1aa7c3..e4dad9ad7 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# GOV.UK Forms Runner [![Tests](https://github.com/alphagov/forms-runner/actions/workflows/test.yml/badge.svg)](https://github.com/alphagov/forms-runner/actions/workflows/test.yml) +# GOV.UK Forms Runner [![Tests](https://github.com/govuk-forms/forms-runner/actions/workflows/test.yml/badge.svg)](https://github.com/govuk-forms/forms-runner/actions/workflows/test.yml) GOV.UK Forms is a service for creating forms. GOV.UK Forms Runner is a an application which displays those forms to end users so that they can be filled in. It's a Ruby on Rails application without a database. It uses Redis for state. @@ -21,7 +21,7 @@ We recommend using a version manager to install and manage these, such as: ```bash # 1. Clone the git repository and change directory to the new folder -git clone git@github.com:alphagov/forms-runner.git +git clone git@github.com:govuk-forms/forms-runner.git cd forms-runner # 2. Run the setup script @@ -47,7 +47,7 @@ or run the rails server: npm run dev ``` -You will also need to run the [forms-admin service](https://github.com/alphagov/forms-admin), as this app needs the API to create and access forms. +You will also need to run the [forms-admin service](https://github.com/govuk-forms/forms-admin), as this app needs the API to create and access forms. #### Getting AWS credentials @@ -261,7 +261,7 @@ If the jobs you need to test interact with AWS, follow the instructions for [Get The forms-runner app is containerised (see [Dockerfile](Dockerfile)) and can be deployed in the same way you'd normally deploy a containerised app. -We host our apps using Amazon Web Services (AWS). You can [read about how deployments happen on our team wiki](https://github.com/alphagov/forms-team/wiki/Deploying-code-changes-AWS), if you have access. +We host our apps using Amazon Web Services (AWS). You can [read about how deployments happen on our team wiki](https://github.com/govuk-forms/forms-team/wiki/Deploying-code-changes-AWS), if you have access. ### Logging @@ -272,7 +272,7 @@ We host our apps using Amazon Web Services (AWS). You can [read about how deploy ### Updating Docker files -To update the version of [Alpine Linux] and Ruby used in the Dockerfile, use the [update_app_versions.sh script in forms-deploy](https://github.com/alphagov/forms-deploy/blob/main/support/update_app_versions.sh) +To update the version of [Alpine Linux] and Ruby used in the Dockerfile, use the [update_app_versions.sh script in forms-deploy](https://github.com/govuk-forms/forms-deploy/blob/main/support/update_app_versions.sh) [Alpine Linux]: https://www.alpinelinux.org/ diff --git a/lib/tasks/deploy.rake b/lib/tasks/deploy.rake index bfeebfe85..c69100d9d 100644 --- a/lib/tasks/deploy.rake +++ b/lib/tasks/deploy.rake @@ -14,7 +14,7 @@ namespace :pipeline do puts "Will use Git commit: #{git_hash}" puts "Checking commit has been pushed..." - resp = Net::HTTP.get_response URI("https://api.github.com/repos/alphagov/forms-runner/commits/#{git_hash}") + resp = Net::HTTP.get_response URI("https://api.github.com/repos/govuk-forms/forms-runner/commits/#{git_hash}") if resp.code != "200" puts "Commit has not been pushed. The pipelines will not be able to find it." puts "Push the commit and run the command again."