Merge branch 'develop' into main

.github/workflows/deploy.yml

@@ -50,6 +50,18 @@ jobs:
         run: |
           script/deploy-terraform
         if: github.ref == 'refs/heads/develop'
+      - name: Deploy terraform to research
+        env:
+          TF_VAR_environment: "research"
+        run: |
+          script/deploy-terraform
+        if: github.ref == 'refs/heads/research'
+      - name: Deploy terraform to preview
+        env:
+          TF_VAR_environment: "preview"
+        run: |
+          script/deploy-terraform
+        if: github.ref == 'refs/heads/main'
       - name: Deploy terraform to prod
         env:
           TF_VAR_environment: "prod"

CHANGELOG.md

@@ -6,6 +6,10 @@ The format is based on [Keep a Changelog 1.0.0].
 
 ## [Unreleased]
 
+## [release-008] - 2021-05-19
+
+- auto deploy research and preview environments
+
 ## [release-007] - 2021-05-19
 
 - Add `noindex,nofollow` meta tag to all pages, as per Gov.UK guidance
@@ -122,7 +126,8 @@ Contentful fixture
 - Contentful can redirect users to preview endpoints
 - users can be asked to answer a long text question
 
-[unreleased]: https://github.com/DFE-Digital/buy-for-your-school/compare/release-007...HEAD
+[unreleased]: https://github.com/DFE-Digital/buy-for-your-school/compare/release-008...HEAD
+[release-008]: https://github.com/DFE-Digital/buy-for-your-school/compare/release-007...release-008
 [release-007]: https://github.com/DFE-Digital/buy-for-your-school/compare/release-006...release-007
 [release-006]: https://github.com/DFE-Digital/buy-for-your-school/compare/release-005...release-006
 [release-005]: https://github.com/DFE-Digital/buy-for-your-school/compare/release-004...release-005