Merge pull request #3208 from OfficeForProductSafetyAndStandards/feat…

…/update-workflows

Update workflows

.github/dependabot.yml

@@ -5,12 +5,15 @@ updates:
     schedule:
       interval: daily
     versioning-strategy: lockfile-only
+    open-pull-requests-limit: 5
   - package-ecosystem: npm
     directory: "/cosmetics-web"
     schedule:
       interval: daily
     versioning-strategy: lockfile-only
+    open-pull-requests-limit: 5
   - package-ecosystem: github-actions
     directory: "/"
     schedule:
       interval: daily
+    open-pull-requests-limit: 5

.github/workflows/deploy-production.yml

@@ -1,16 +1,18 @@
-name: Deploy Production
+name: Deploy to Production
 
 on:
-  push:
-    branches:
-      - main
+  release:
+    types:
+      - released
 
 jobs:
   deploy:
     name: Deploy to Pre-Prod and Production
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
+      with:
+        ref: ${{ github.ref_name }}
     - name: Install cf client
       env:
         CF_CLI_VERSION: v7
@@ -131,6 +133,8 @@ jobs:
         gh_deploy_failure production $LOG_URL
 
     - uses: actions/checkout@v4
+      with:
+        ref: ${{ github.ref_name }}
     - name: Create Sentry release
       if: success()
       uses: getsentry/action-release@v1

.github/workflows/deploy-staging.yml

@@ -1,8 +1,10 @@
-name: Deploy Staging
-"on":
+name: Deploy to Staging
+
+on:
   push:
     branches:
-      - develop
+      - main
+
 jobs:
   deploy:
     name: Deploy to Staging
@@ -21,7 +23,7 @@ jobs:
       - name: Create GitHub deployment for Staging
         env:
           GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
-          BRANCH: develop
+          BRANCH: main
         run: |
           source cosmetics-web/deploy-github-functions.sh
           gh_deploy_create staging
@@ -31,16 +33,14 @@ jobs:
         run: >
           source cosmetics-web/deploy-github-functions.sh
 
-
           # URL where the deployment progress can be tracked. Exported for
           future steps.
 
           log_url=$(echo
-          "https://github.com/$GITHUB_REPOSITORY/actions?query=branch%3Adevelop+workflow%3ADeploy+Staging")
+          "https://github.com/$GITHUB_REPOSITORY/actions?query=branch%3Amain+workflow%3ADeploy+Staging")
 
           echo "LOG_URL=$log_url" >> $GITHUB_ENV
 
-
           gh_deploy_initiate staging $log_url
       - name: Deploy to Staging
         env:

.github/workflows/review-apps-delete.yml

@@ -13,10 +13,12 @@ jobs:
     runs-on: ubuntu-latest
     # Skip if it is a Dependabot created PR. They do not have Review Apps to delete.
     if: ${{ github.actor != 'dependabot[bot]' }}
+
     env:
       SPACE: int
       CF_USERNAME: ${{ secrets.PaaSUsernameInt }}
       CF_PASSWORD: ${{ secrets.PaaSPasswordInt }}
+
     steps:
     - name: Install cf client
       env:

cosmetics-web/docs/deployment.md

@@ -1,9 +1,9 @@
 # Deployment
 
-Anything which is merged to `develop` will trigger a [GitHub Action](https://github.com/OfficeForProductSafetyAndStandards/cosmetic-product-notifications/actions/workflows/deploy-staging.yml)
+Anything which is merged to `main` will trigger a [GitHub Action](https://github.com/OfficeForProductSafetyAndStandards/cosmetic-product-notifications/actions/workflows/deploy-staging.yml)
 and deploy the various components to the `staging` space on GOV.UK PaaS.
 
-Anything which is merged to `main` will trigger a [GitHub Action](https://github.com/OfficeForProductSafetyAndStandards/cosmetic-product-notifications/actions/workflows/deploy-production.yml)
+A GitHub Release with associated tag will trigger a [GitHub Action](https://github.com/OfficeForProductSafetyAndStandards/cosmetic-product-notifications/actions/workflows/deploy-production.yml)
 and deploy the various components to the `pre-prod` and `prod` spaces on GOV.UK PaaS.
 
 ## Deployment from scratch

cosmetics-web/support_portal/support_portal.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |spec|
 
   spec.metadata["homepage_uri"] = spec.homepage
   spec.metadata["source_code_uri"] = "https://github.com/OfficeForProductSafetyAndStandards/cosmetic-product-notifications"
-  spec.metadata["changelog_uri"] = "https://github.com/OfficeForProductSafetyAndStandards/cosmetic-product-notifications/blob/develop/support_portal/CHANGELOG.md"
+  spec.metadata["changelog_uri"] = "https://github.com/OfficeForProductSafetyAndStandards/cosmetic-product-notifications/blob/main/support_portal/CHANGELOG.md"
 
   spec.files = Dir.chdir(File.expand_path(__dir__)) do
     Dir["{app,config,db,lib}/**/*", "CHANGELOG.md", "Rakefile", "README.md"]