Merge branch 'main' into add-ldap-auth

Author: kriswest

.github/workflows/ci.yml

@@ -43,7 +43,7 @@ jobs:
           mongodb-version: ${{ matrix.mongodb-version }}
 
       - name: Install dependencies
-        run: npm ci
+        run: npm ci --no-fund
 
       # for now only check the types of the server
       # tsconfig isn't quite set up right to respect what vite accepts
@@ -54,6 +54,11 @@ jobs:
       - name: Build TypeScript
         run: npm run build-ts
 
+      - name: Build CLI
+        run: |
+          npm run build -w @finos/git-proxy-cli
+          npm rebuild @finos/git-proxy-cli
+
       - name: Test
         id: test
         run: |
@@ -69,28 +74,17 @@ jobs:
       - name: Upload test coverage report
         uses: codecov/codecov-action@1af58845a975a7985b0beb0cbe6fbbb71a41dbad # v5.5.3
         with:
-          files: ./coverage/lcov.info
+          files: ./coverage/lcov.info,./coverage-cli/lcov.info
           token: ${{ secrets.CODECOV_TOKEN }}
 
       - name: Build frontend
         run: npm run build-ui
 
-      - name: Save build folder
-        uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7
-        with:
-          name: build-ubuntu-node-${{ matrix.node-version }}-mongo-${{ matrix.mongodb-version }}
-          if-no-files-found: error
-          path: build
-
-      - name: Download the build folders
-        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8
-        with:
-          name: build-ubuntu-node-${{ matrix.node-version }}-mongo-${{ matrix.mongodb-version }}
-          path: build
-
       - name: Run cypress test
         uses: cypress-io/github-action@4c06c48f3ffea349b7189aa06dfcda47a9fa7b92 # v7.1.8
         with:
+          # skip the action's internal npm ci — dependencies are already installed above
+          install: false
           start: npm start &
           wait-on: 'http://localhost:3000'
           wait-on-timeout: 120
@@ -121,14 +115,19 @@ jobs:
           reg add "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\AppModelUnlock" /t REG_DWORD /f /v "AllowDevelopmentWithoutDevLicense" /d "1"
 
       - name: Install dependencies
-        run: npm ci
+        run: npm ci --no-fund
 
       - name: Check Types (Server)
         run: npm run check-types:server
 
       - name: Build TypeScript
         run: npm run build-ts
 
+      - name: Build CLI
+        run: |
+          npm run build -w @finos/git-proxy-cli
+          npm rebuild @finos/git-proxy-cli
+
       - name: Test
         id: test
         shell: bash

.github/workflows/e2e.yml

@@ -14,13 +14,23 @@ on:
 jobs:
   e2e:
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        suite: [vitest, cypress]
+    env:
+      BUILDX_CACHE_SCOPE: ${{ matrix.suite }}-build
 
     steps:
       - name: Checkout code
         uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@d91f340399fb2345e3e45f5461e116862b08261d
+        with:
+          install: true
+
+      - name: Expose GitHub Runtime for Docker Cache
+        uses: crazy-max/ghaction-github-runtime@3cb05d89e1f492524af3d41a1c98c83bc3025124 # v3
 
       - name: Set up Docker Compose
         uses: docker/setup-compose-action@e29e0ecd235838be5f2e823f8f512a72dc55f662
@@ -41,18 +51,20 @@ jobs:
           git config --global init.defaultBranch main
 
       - name: Build and start services with Docker Compose
-        run: docker compose up -d --build --wait || true
+        run: docker compose -f docker-compose.yml -f docker-compose.ci.yml up -d --build --wait
 
       - name: Debug service state
-        if: always()
+        if: failure()
         run: |
           docker compose ps
           docker compose logs
 
-      - name: Run E2E tests
+      - name: Run vitest E2E tests
+        if: matrix.suite == 'vitest'
         run: npm run test:e2e
 
       - name: Run Cypress E2E tests
+        if: matrix.suite == 'cypress'
         run: npm run cypress:run:docker
         timeout-minutes: 10
         env:
@@ -67,7 +79,7 @@ jobs:
 
       - name: Upload Cypress screenshots on failure
         uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7
-        if: failure()
+        if: failure() && matrix.suite == 'cypress'
         with:
           name: cypress-screenshots
           path: cypress/screenshots
@@ -76,3 +88,18 @@ jobs:
       - name: Stop services
         if: always()
         run: docker compose down -v
+
+  results:
+    if: ${{ always() }}
+    runs-on: ubuntu-latest
+    name: e2e
+    needs: [e2e]
+    steps:
+      - name: Check e2e results
+        run: |
+          result="${{ needs.e2e.result }}"
+          if [[ "$result" == "success" || "$result" == "skipped" ]]; then
+            exit 0
+          else
+            exit 1
+          fi

.github/workflows/unused-dependencies.yml

@@ -21,7 +21,7 @@ jobs:
           node-version: '24.x'
       - name: 'Run depcheck'
         run: |
-          npx depcheck --skip-missing --ignores="tsx,@babel/*,@commitlint/*,eslint,eslint-*,husky,ts-node,concurrently,nyc,prettier,typescript,tsconfig-paths,vite-tsconfig-paths,quicktype,history,@types/domutils,@vitest/coverage-v8,cross-env"
+          npx depcheck --skip-missing --ignores="tsx,@babel/*,@commitlint/*,eslint,eslint-*,husky,ts-node,concurrently,nyc,prettier,typescript,tsconfig-paths,vite-tsconfig-paths,quicktype,history,@types/domutils,@vitest/coverage-v8,cross-env,c8"
           echo $?
           if [[ $? == 1 ]]; then
             echo "Unused dependencies or devDependencies found"

.gitignore

@@ -245,6 +245,7 @@ dist
 
 # testing
 /coverage
+/coverage-cli
 
 # production
 /build

README.md

@@ -89,7 +89,7 @@ For detailed step-by-step instructions for how to install, deploy & configure Gi
 customize for your environment, see the [project's documentation](https://git-proxy.finos.org/docs/):
 
 - [Quickstart](https://git-proxy.finos.org/docs/category/quickstart/)
-- [Installation](https://git-proxy.finos.org/docs/installation)
+- [Installation](https://git-proxy.finos.org/docs/quickstart/installation)
 - [Configuration](https://git-proxy.finos.org/docs/category/configuration)
 - [Contributing](https://git-proxy.finos.org/docs/development/contributing)
 - [Testing](https://git-proxy.finos.org/docs/development/testing)

docker-compose.ci.yml

@@ -0,0 +1,16 @@
+services:
+  git-proxy:
+    build:
+      context: .
+      cache_from:
+        - type=gha
+      cache_to:
+        - type=gha,mode=max
+
+  git-server:
+    build:
+      context: localgit/
+      cache_from:
+        - type=gha
+      cache_to:
+        - type=gha,mode=max