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

Chore/reorganize #79

Merged
merged 8 commits into from
Oct 3, 2024
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
29 changes: 22 additions & 7 deletions .github/workflows/checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,16 @@ jobs:
components: rustfmt
- uses: mbrobbel/rustfmt-check@master
with:
args: --manifest-path ./lambda/Cargo.toml
token: ${{ secrets.GITHUB_TOKEN }}
mode: review

clippy:
name: "Rust Lint"
runs-on: ubuntu-latest
defaults:
run:
working-directory: ./lambda
steps:
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@nightly
Expand All @@ -40,25 +44,27 @@ jobs:
tests:
name: "Rust Tests"
runs-on: ubuntu-latest
defaults:
run:
working-directory: ./lambda
steps:
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@stable
with:
components: clippy
- uses: dtolnay/rust-toolchain@nightly
- name: Tests
run: cargo test

tsbuild:
name: "CDK Build & Test"
runs-on: ubuntu-latest
defaults:
run:
working-directory: ./cdk
steps:
- uses: actions/checkout@v4
- name: Use Node.js
uses: actions/setup-node@v4
- uses: actions/setup-node@v4
with:
node-version: '20.x'
- working-directory: ./cdk
run: |
- run: |
npm ci
npm run build
npm test
Expand All @@ -72,7 +78,16 @@ jobs:
steps:
- uses: actions/checkout@v4
- uses: reviewdog/action-eslint@v1
name: Lint CDK
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
reporter: github-pr-review
filter_mode: diff_context
workdir: ./cdk
- uses: reviewdog/action-eslint@v1
name: Lint Lambda Playwright
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
reporter: github-pr-review
filter_mode: diff_context
workdir: ./lambda/playwright
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ cdk.out
.idea

.env
/test-results/
*/test-results/
/playwright-report/
/blob-report/
/playwright/.cache/
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion jest.config.js → cdk/jest.config.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module.exports = {
testEnvironment: 'node',
roots: ['<rootDir>/cdk/test'],
roots: ['<rootDir>/test'],
testMatch: ['**/*.test.ts'],
transform: {
'^.+\\.tsx?$': 'ts-jest',
Expand Down
2 changes: 1 addition & 1 deletion cdk/lib/application-layer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ export default class ApplicationLayerStack extends Stack {

const handler = new RustFunction(this, 'RecipeFunction', {
functionName: 'RecipeFunction',
manifestPath: join(__dirname, '..', '..', 'Cargo.toml'),
manifestPath: join(__dirname, '..', '..', 'lambda/Cargo.toml'),
environment: {
RECIPE_TABLE_NAME: props.recipeTable.tableName,
},
Expand Down
Loading
Loading