From 772d8f7179cf43c778ac0f226d6ef0ef9e6f2a8c Mon Sep 17 00:00:00 2001 From: imanDoumi Date: Wed, 21 Jan 2026 08:24:54 +0100 Subject: [PATCH 1/4] add merge request pipeline (frontend + backend) --- .github/workflows/ci-merge-request.yml | 54 ++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100644 .github/workflows/ci-merge-request.yml diff --git a/.github/workflows/ci-merge-request.yml b/.github/workflows/ci-merge-request.yml new file mode 100644 index 00000000..9da0f9b0 --- /dev/null +++ b/.github/workflows/ci-merge-request.yml @@ -0,0 +1,54 @@ +name: CI - Merge Request + +on: + pull_request: + branches: + - main + +jobs: + frontend_ci: + name: Frontend CI + runs-on: ubuntu-latest + + steps: + - name: Checkout repository + uses: actions/checkout@v4 + + - name: Setup Node.js + uses: actions/setup-node@v4 + with: + node-version: 20 + + - name: Install frontend dependencies + run: npm install + working-directory: ./frontend + + - name: Build React app + run: npm run build + working-directory: ./frontend + + - name: Run frontend lint + run: npm run lint + working-directory: ./frontend + + + backend_ci: + name: Backend CI + runs-on: ubuntu-latest + + steps: + - name: Checkout repository + uses: actions/checkout@v4 + + - name: Setup .NET SDK + uses: actions/setup-dotnet@v4 + with: + dotnet-version: '9.0.x' + + - name: Restore backend dependencies + run: dotnet restore + working-directory: ./backend + + - name: Build backend (Release) + run: dotnet build -c Release + working-directory: ./backend From 1afd9d9257fab10ddc67350afed023b23b6ad390 Mon Sep 17 00:00:00 2001 From: imanDoumi Date: Wed, 21 Jan 2026 08:25:06 +0100 Subject: [PATCH 2/4] test --- .github/workflows/ci-merge-request.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/ci-merge-request.yml b/.github/workflows/ci-merge-request.yml index 9da0f9b0..a6ea2e79 100644 --- a/.github/workflows/ci-merge-request.yml +++ b/.github/workflows/ci-merge-request.yml @@ -50,5 +50,4 @@ jobs: working-directory: ./backend - name: Build backend (Release) - run: dotnet build -c Release - working-directory: ./backend + run: dotnet build -c From 2691fa563390bbe0717d5d17bbda4ba3c8c50980 Mon Sep 17 00:00:00 2001 From: imanDoumi Date: Wed, 21 Jan 2026 08:57:36 +0100 Subject: [PATCH 3/4] tteest --- .github/workflows/ci-merge-request.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci-merge-request.yml b/.github/workflows/ci-merge-request.yml index a6ea2e79..bd323316 100644 --- a/.github/workflows/ci-merge-request.yml +++ b/.github/workflows/ci-merge-request.yml @@ -2,7 +2,7 @@ name: CI - Merge Request on: pull_request: - branches: + branches: - main jobs: From 05ff036731a516d8d3f5f9034609a011d0c4cc43 Mon Sep 17 00:00:00 2001 From: imanDoumi Date: Wed, 21 Jan 2026 09:05:51 +0100 Subject: [PATCH 4/4] test CI --- .github/workflows/ci-merge-request.yml | 33 +++++++++++++------------- frontend/tsconfig.json | 1 + 2 files changed, 18 insertions(+), 16 deletions(-) diff --git a/.github/workflows/ci-merge-request.yml b/.github/workflows/ci-merge-request.yml index bd323316..a4a9cab6 100644 --- a/.github/workflows/ci-merge-request.yml +++ b/.github/workflows/ci-merge-request.yml @@ -1,43 +1,42 @@ -name: CI - Merge Request + +name: CI on Pull Request on: pull_request: - branches: + branches: - main + types: [opened, synchronize, reopened] jobs: - frontend_ci: - name: Frontend CI + frontend: runs-on: ubuntu-latest steps: - - name: Checkout repository + - name: Checkout code uses: actions/checkout@v4 - name: Setup Node.js uses: actions/setup-node@v4 with: - node-version: 20 + node-version: '20' - - name: Install frontend dependencies - run: npm install + - name: Install dependencies + run: npm ci working-directory: ./frontend - name: Build React app run: npm run build working-directory: ./frontend - - name: Run frontend lint + - name: Run lint run: npm run lint working-directory: ./frontend - - backend_ci: - name: Backend CI + backend: runs-on: ubuntu-latest steps: - - name: Checkout repository + - name: Checkout code uses: actions/checkout@v4 - name: Setup .NET SDK @@ -45,9 +44,11 @@ jobs: with: dotnet-version: '9.0.x' - - name: Restore backend dependencies + - name: Restore dependencies run: dotnet restore working-directory: ./backend - - name: Build backend (Release) - run: dotnet build -c + - name: Build backend in Release + run: dotnet build -c Release --no-restore + working-directory: ./backend + diff --git a/frontend/tsconfig.json b/frontend/tsconfig.json index fec8c8e5..6de0d4b9 100644 --- a/frontend/tsconfig.json +++ b/frontend/tsconfig.json @@ -3,6 +3,7 @@ "references": [ { "path": "./tsconfig.app.json" }, { "path": "./tsconfig.node.json" } + // { "path": "./tsconfig.node.json" } ], "compilerOptions": { "baseUrl": ".",