Skip to content
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
Binary file removed .coverage
Binary file not shown.
4 changes: 2 additions & 2 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ updates:
# npm dependencies - grouped
- package-ecosystem: "npm"
directories:
- "/src/App"
- "/src/App/server"
- "/src/app/frontend"
- "/src/app/frontend-server"
schedule:
interval: "monthly"
target-branch: "dependabotchanges"
Expand Down
18 changes: 8 additions & 10 deletions .github/workflows/docker-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ on:
- demo
paths:
- 'src/backend/**'
- 'src/App/**'
- 'src/App/server/**'
- 'src/App/WebApp.Dockerfile'
- 'src/App/.dockerignore'
- 'src/app/frontend/**'
- 'src/app/frontend-server/**'
- '.github/workflows/docker-build.yml'
pull_request:
types:
- opened
- ready_for_review
Expand All @@ -23,10 +23,8 @@ on:
- demo
paths:
- 'src/backend/**'
- 'src/App/**'
- 'src/App/server/**'
- 'src/App/WebApp.Dockerfile'
- 'src/App/.dockerignore'
- 'src/app/frontend/**'
- 'src/app/frontend-server/**'
- '.github/workflows/docker-build.yml'
workflow_dispatch:

Expand Down Expand Up @@ -90,8 +88,8 @@ jobs:
- name: Build and Push Docker Image for Frontend Server
uses: docker/build-push-action@v6
with:
context: ./src/App
file: ./src/App/WebApp.Dockerfile
context: ./src/app
file: ./src/app/WebApp.Dockerfile
push: ${{ github.ref_name == 'main' || github.ref_name == 'dev' || github.ref_name == 'demo' || github.ref_name == 'dependabotchanges' }}
tags: |
${{ secrets.ACR_LOGIN_SERVER || 'acrlogin.azurecr.io' }}/content-gen-app:${{ steps.determine_tag.outputs.tagname }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/job-docker-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,8 @@ jobs:
env:
DOCKER_BUILD_SUMMARY: false
with:
context: ./src/App
file: ./src/App/WebApp.Dockerfile
context: ./src/app
file: ./src/app/WebApp.Dockerfile
push: true
tags: |
${{ secrets.ACR_TEST_LOGIN_SERVER }}/content-gen-app:${{ steps.generate_docker_tag.outputs.AZURE_ENV_IMAGE_TAG }}
Expand Down
12 changes: 6 additions & 6 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -36,15 +36,15 @@ eggs/
*.swo

# Node
/src/App/node_modules/
/src/App/server/node_modules/
/src/App/server/static/
/src/App/server/*.zip
/src/app/frontend/node_modules/
/src/app/frontend-server/node_modules/
/src/app/frontend-server/static/
/src/app/frontend-server/*.zip
node_modules/

# Build output
/src/App/static/
/src/App/dist/
/src/app/static/
/src/app/frontend/dist/

# Logs
*.log
Expand Down
Loading
Loading