Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge develop to main #267

Merged
merged 319 commits into from
Jul 23, 2024
Merged

Merge develop to main #267

merged 319 commits into from
Jul 23, 2024

Conversation

simonbs
Copy link
Contributor

@simonbs simonbs commented Jul 23, 2024

The main branch is far behind the develop branch, however, the changes on the develop branch have already been deployed to production. Let's make sure that the main branch reflects this.

simonbs and others added 30 commits June 25, 2024 18:26
* Basic infrastructure setup for AWS

* Remove incorrect comment

* Stick with 2 AZs for now

* Permit app to send email

* Bump CDK version

* Encapsulate deployment in construct

* Allow redis access from app

* Env vars and certificate

* Fix cert

* Configure postgres

* Configure GitHub Actions user's permissions

* Fix deploy user permissions

* Remove unused tests

* Exclude "infrastructure" folder from main tsconfig

It has it's own tsconfig
Indicates to code that we are in a build environment which does not have access to e.g. a database.
Copy link

⚠️ It looks like .env.example has changed. Remember to update the Setting Environment Variables article accordingly.

@simonbs simonbs enabled auto-merge July 23, 2024 11:11
simonbs and others added 8 commits July 23, 2024 13:15
Bumps [typescript](https://github.com/Microsoft/TypeScript) from 5.5.3 to 5.5.4.
- [Release notes](https://github.com/Microsoft/TypeScript/releases)
- [Changelog](https://github.com/microsoft/TypeScript/blob/main/azure-pipelines.release.yml)
- [Commits](microsoft/TypeScript@v5.5.3...v5.5.4)

---
updated-dependencies:
- dependency-name: typescript
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Bumps [@typescript-eslint/eslint-plugin](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/eslint-plugin) from 6.21.0 to 7.0.0.
- [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases)
- [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/eslint-plugin/CHANGELOG.md)
- [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v7.0.0/packages/eslint-plugin)

---
updated-dependencies:
- dependency-name: "@typescript-eslint/eslint-plugin"
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>
…pt-5.5.4

Bump typescript from 5.5.3 to 5.5.4
…pt-eslint/eslint-plugin-7.0.0

Bump @typescript-eslint/eslint-plugin from 6.21.0 to 7.0.0
ulrikandersen
ulrikandersen previously approved these changes Jul 23, 2024
Copy link
Contributor

@ulrikandersen ulrikandersen left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🚀🚀🚀

@simonbs simonbs disabled auto-merge July 23, 2024 13:10
@simonbs simonbs merged commit 0288d77 into main Jul 23, 2024
6 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants