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

feat: support hybrid deployments #74

Merged
merged 13 commits into from
Sep 15, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions .changeset/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,18 @@
"$schema": "https://unpkg.com/@changesets/[email protected]/schema.json",
"access": "public",
"baseBranch": "main",
"changelog": ["@changesets/changelog-github", { "repo": "lukeshay/astro-aws" }],
"changelog": [
"@changesets/changelog-github",
{ "repo": "lukeshay/astro-aws" }
],
"commit": false,
"fixed": [],
"ignore": ["@astro-aws/www", "@astro-aws/infra"],
"ignore": [
"@astro-aws/www",
"@astro-aws/infra",
"@astro-aws/docs",
"@astro-aws/examples-astro-ecommerce"
],
"linked": [["@astro-aws/adapter", "@astro-aws/constructs"]],
"updateInternalDependencies": "patch"
}
14 changes: 3 additions & 11 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -1,17 +1,9 @@
.pnp.*
.yarn/*

.cdk.staging
.DS_Store
.env
.env.production
.netlify
.env*
.turbo
*.log*
apps/docs/src/content/docs/references/packages/*
cdk.out/
dist/
node_modules/
npm-debug.log*
pnpm-debug.log*
yarn-debug.log*
yarn-error.log*
apps/www/src/pages/docs/packages/*
12 changes: 10 additions & 2 deletions .eslintrc.cjs
Original file line number Diff line number Diff line change
@@ -1,8 +1,16 @@
require("@rushstack/eslint-patch/modern-module-resolution");
require("@rushstack/eslint-patch/modern-module-resolution")

/** @type {import("eslint").Linter.Config} */
module.exports = {
extends: ["@lshay/eslint-config"],
overrides: [
{
files: ["*.test.*"],
rules: {
"@typescript-eslint/no-unsafe-assignment": "off",
},
},
],
root: true,
rules: {
"import/no-useless-path-segments": "off",
Expand All @@ -23,4 +31,4 @@ module.exports = {
},
},
},
};
}
6 changes: 3 additions & 3 deletions .github/FUNDING.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
github:
- lukeshay
- lukeshay
custom:
- https://account.venmo.com/u/LukeShay
- https://paypal.me/rlshay
- https://account.venmo.com/u/LukeShay
- https://paypal.me/rlshay
open_collective: https://opencollective.com/astro-aws
# patreon: # Replace with a single Patreon username
# ko_fi: # Replace with a single Ko-fi username
Expand Down
88 changes: 44 additions & 44 deletions .github/ISSUE_TEMPLATE/bug-report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,53 +3,53 @@ description: "If something isn't working as expected 🤔."
title: "[Bug]: "
labels: ["needs triage", "bug"]
body:
- type: markdown
attributes:
value: Thanks for taking the time to file a bug report! Please fill out this form as completely as possible.
- type: markdown
attributes:
value: Thanks for taking the time to file a bug report! Please fill out this form as completely as possible.

- type: checkboxes
id: input1
attributes:
label: "💻"
options:
- label: Would you like to work on a fix?
- type: checkboxes
id: input1
attributes:
label: "💻"
options:
- label: Would you like to work on a fix?

- type: textarea
attributes:
label: Input code
description: You must write here the minimal input code necessary to reproduce the bug.
placeholder: |
```js
new Stack(app, "Stack", {});
```
validations:
required: true
- type: textarea
attributes:
label: Input code
description: You must write here the minimal input code necessary to reproduce the bug.
placeholder: |
```js
new Stack(app, "Stack", {});
```
validations:
required: true

- type: textarea
attributes:
label: Current and expected behavior
description: A clear and concise description of what Babel is doing and what you would expect.
validations:
required: true
- type: textarea
attributes:
label: Current and expected behavior
description: A clear and concise description of what Babel is doing and what you would expect.
validations:
required: true

- type: textarea
attributes:
label: Environment
placeholder: |
- Astro AWS version(s):
- Astro version(s):
- Node:
- npm/Yarn version: [e.g. npm 7/Yarn 2.3]
- AWS CDK version(s):
validations:
required: true
- type: textarea
attributes:
label: Environment
placeholder: |
- Astro AWS version(s):
- Astro version(s):
- Node:
- pnpm/npm/yarn version: [e.g. npm 7/Yarn 2.3]
- AWS CDK version(s):
validations:
required: true

- type: textarea
attributes:
label: Possible solution
description: "If you have suggestions on a fix for the bug."
- type: textarea
attributes:
label: Possible solution
description: "If you have suggestions on a fix for the bug."

- type: textarea
attributes:
label: Additional context
description: "Add any other context about the problem here. Or a screenshot if applicable."
- type: textarea
attributes:
label: Additional context
description: "Add any other context about the problem here. Or a screenshot if applicable."
10 changes: 5 additions & 5 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
blank_issues_enabled: false
contact_links:
- name: 🗣 Ask a Question, Discuss
url: https://github.com/lukeshay/astro-aws/discussions
- name: 🤗 Support the Project
url: https://github.com/sponsors/astro-aws
about: Support Astro AWS financially.
- name: 🗣 Ask a Question, Discuss
url: https://github.com/lukeshay/astro-aws/discussions
- name: 🤗 Support the Project
url: https://github.com/sponsors/astro-aws
about: Support Astro AWS financially.
70 changes: 35 additions & 35 deletions .github/ISSUE_TEMPLATE/feature-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,43 +2,43 @@ name: "🚀 Feature Request"
description: "I have a specific suggestion for Babel!"
labels: ["needs triage", "enhancement"]
body:
- type: markdown
attributes:
value: Thanks for taking the time to suggest a new feature! Please fill out this form as completely as possible.
- type: markdown
attributes:
value: Thanks for taking the time to suggest a new feature! Please fill out this form as completely as possible.

- type: checkboxes
id: input1
attributes:
label: "💻"
description: |
Check this if you would like to implement a PR, we are more than happy to help you go through the process
options:
- label: Would you like to work on this feature?
- type: checkboxes
id: input1
attributes:
label: "💻"
description: |
Check this if you would like to implement a PR, we are more than happy to help you go through the process
options:
- label: Would you like to work on this feature?

- type: textarea
attributes:
label: What problem are you trying to solve?
description: |
A concise description of what the problem is.
placeholder: |
I have an issue when [...]
validations:
required: true
- type: textarea
attributes:
label: What problem are you trying to solve?
description: |
A concise description of what the problem is.
placeholder: |
I have an issue when [...]
validations:
required: true

- type: textarea
attributes:
label: Describe the solution you'd like
validations:
required: true
- type: textarea
attributes:
label: Describe the solution you'd like
validations:
required: true

- type: textarea
attributes:
label: Describe alternatives you've considered
validations:
required: true
- type: textarea
attributes:
label: Describe alternatives you've considered
validations:
required: true

- type: textarea
attributes:
label: Documentation, Adoption, Migration Strategy
description: |
If you can, explain how users will be able to use this and how it might be documented. Maybe a mock-up?
- type: textarea
attributes:
label: Documentation, Adoption, Migration Strategy
description: |
If you can, explain how users will be able to use this and how it might be documented. Maybe a mock-up?
112 changes: 43 additions & 69 deletions .github/workflows/cd-dev.yml
Original file line number Diff line number Diff line change
@@ -1,78 +1,52 @@
name: CD

on:
workflow_run:
workflows:
- CI
branches:
- main
types:
- completed
workflow_run:
workflows:
- CI
branches:
- main
types:
- completed

env:
CI: true
TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }}
TURBO_TEAM: ${{ secrets.TURBO_TEAM }}
CI: true
TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }}
TURBO_TEAM: ${{ secrets.TURBO_TEAM }}

permissions:
id-token: write
contents: read
deployments: write
id-token: write
contents: read
deployments: write

jobs:
prepare-yarn-cache:
name: Cache dependencies
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: "18"
cache: "yarn"
- run: yarn install --mode=skip-build
env:
YARN_ENABLE_SCRIPTS: false
deploy-dev:
name: Deploy Dev
needs: [prepare-yarn-cache]
concurrency:
group: ${{ format('{0}-{1}', github.workflow, github.job) }}
uses: ./.github/workflows/deploy.yml
with:
environment_name: development
environment_url: https://dev.astro-aws.org/
stack_environment: DEV
secrets: inherit
deploy-dev-node-16:
name: Deploy Dev Node 16
needs: [prepare-yarn-cache]
concurrency:
group: ${{ format('{0}-{1}', github.workflow, github.job) }}
uses: ./.github/workflows/deploy.yml
with:
environment_name: development-node-16
environment_url: https://node16.dev.astro-aws.org/
stack_environment: NODE16
secrets: inherit
deploy-dev-node-18:
name: Deploy Dev Node 18
needs: [prepare-yarn-cache]
concurrency:
group: ${{ format('{0}-{1}', github.workflow, github.job) }}
uses: ./.github/workflows/deploy.yml
with:
environment_name: development-node-18
environment_url: https://node18.dev.astro-aws.org/
stack_environment: NODE18
secrets: inherit
deploy-dev-edge:
name: Deploy Dev Edge
needs: [prepare-yarn-cache]
concurrency:
group: ${{ format('{0}-{1}', github.workflow, github.job) }}
uses: ./.github/workflows/deploy.yml
with:
environment_name: development-edge
environment_url: https://edge.dev.astro-aws.org/
stack_environment: EDGE
secrets: inherit
deploy-dev:
name: Deploy Dev
concurrency:
group: ${{ format('{0}-{1}', github.workflow, github.job) }}
uses: ./.github/workflows/deploy.yml
with:
environment_name: development
environment_url: https://dev.astro-aws.org/
stack_environment: DEV
secrets: inherit
deploy-dev-ssr:
name: Deploy Dev SSR
concurrency:
group: ${{ format('{0}-{1}', github.workflow, github.job) }}
uses: ./.github/workflows/deploy.yml
with:
environment_name: development-ssr
environment_url: https://ssr.dev.astro-aws.org/
stack_environment: SSR
secrets: inherit
deploy-dev-edge:
name: Deploy Dev Edge
concurrency:
group: ${{ format('{0}-{1}', github.workflow, github.job) }}
uses: ./.github/workflows/deploy.yml
with:
environment_name: development-edge
environment_url: https://edge.dev.astro-aws.org/
stack_environment: EDGE
secrets: inherit
Loading
Loading