Skip to content

Commit

Permalink
Merge branch 'main' into renovate/major-testing-library-monorepo
Browse files Browse the repository at this point in the history
  • Loading branch information
rocketstack-matt authored Feb 22, 2025
2 parents 6bb0577 + 5203b58 commit cf1741c
Show file tree
Hide file tree
Showing 111 changed files with 3,734 additions and 1,178 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-calm-hub.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
# Step 4: Set up Docker (Required for Testcontainers)
- name: Set up Docker
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@v3

# Step 5: Build and Test
- name: Build and Test
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build-cli.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,5 +37,5 @@ jobs:
- name: Build workspace
run: npm run build:cli

- name: Run tests for CLI
run: npm run test --workspace=cli
- name: Run tests with coverage for CLI
run: npm run test --workspace=cli
2 changes: 1 addition & 1 deletion .github/workflows/build-shared.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,5 +35,5 @@ jobs:
- name: Build workspace
run: npm run build --workspace=shared

- name: Run tests for Shared
- name: Run tests with coverage for Shared
run: npm run test --workspace=shared
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,6 @@ node_modules/

**/tsconfig.tsbuildinfo

!/.mvn/wrapper/maven-wrapper.jar
!/.mvn/wrapper/maven-wrapper.jar

coverage/
5 changes: 5 additions & 0 deletions calm-hub/src/main/webapp/vite.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,10 @@ export default defineConfig({
build: {
outDir: 'build/',
emptyOutDir: true
},
server: {
proxy: {
'/calm' :'http://localhost:8080'
}
}
})
Loading

0 comments on commit cf1741c

Please sign in to comment.