Apply option 2 #1458

Author: joelvdavies

.github/workflows/ci-build.yml

@@ -23,10 +23,45 @@ on:
       - develop
 
 jobs:
+  detect_changes:
+    runs-on: ubuntu-latest
+    outputs:
+      only_docs_changed: ${{ steps.filter.outputs.only_docs }}
+    steps:
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+        with:
+          fetch-depth: 0
+
+      - name: Set base ref
+        run: echo "BASE_REF=${{ github.base_ref || 'develop' }}" >> $GITHUB_ENV
+
+      - name: Fetch base branch
+        run: git fetch origin $BASE_REF
+
+      - name: Get changed files
+        id: changed
+        run: |
+          BASE=$(git merge-base HEAD origin/develop)
+          echo "Merge base is $BASE"
+          git diff --name-only $BASE HEAD > changed.txt
+          cat changed.txt
+
+      - name: Check unit tests should run
+        id: filter
+        run: |
+          if grep -vE '^(server/|cypress/|cypress\.config\.ts|README\.md|\.github/workflows/ci-build\.yml|renovate\.json|LICENSE|\.prettierrc|\.github/workflows/release-build\.yml|\.github/PULL_REQUEST_TEMPLATE\.md|public/robots\.txt)' changed.txt | grep .; then
+            echo "only_docs=true" >> $GITHUB_OUTPUT
+            echo "changes"
+          else
+            echo "only_docs=false" >> $GITHUB_OUTPUT
+            echo "no change"
+          fi
+
   lint-and-unit-test:
     name: Lint & Unit Tests
     runs-on: ubuntu-latest
-
+    needs: detect_changes
+    if: needs.detect_changes.outputs.only_docs_changed != 'false'
     steps:
       - name: Checkout repo
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
@@ -113,10 +148,10 @@ jobs:
           mv -v inventory-management-system/* inventory-management-system-api/
           cd inventory-management-system-api/
 
-      - name: Start MongoDB (For inventory-management-system-api)
+      - name: Setup MongoDB (For inventory-management-system-api)
         working-directory: ../inventory-management-system-api
         run: |
-          docker compose up --detach mongo-db
+          python ./scripts/dev_cli.py --ci db-init --replicaSetMemberHost localhost
 
       # Use docker run here to test the actual built image
       # Use same network as the MongoDB instance (which is generated by docker compose based on the folder
@@ -136,18 +171,16 @@ jobs:
           --env API__ALLOWED_CORS_HEADERS='["*"]' \
           --env API__ALLOWED_CORS_ORIGINS='["*"]' \
           --env API__ALLOWED_CORS_METHODS='["*"]' \
-          --env OBJECT_STORAGE__ENABLED=true \
+          --env OBJECT_STORAGE__ENABLED=false \
           --env OBJECT_STORAGE__API_REQUEST_TIMEOUT_SECONDS=10 \
           --env OBJECT_STORAGE__API_URL=http://localhost:8002 \
-          --volume /home/runner/work/inventory-management-system/inventory-management-system-api/logging.example.ini:/app/logging.ini \
           harbor.stfc.ac.uk/inventory-management-system/ims-api:develop
 
       - name: Clone Object Storage api repo
         uses: actions/checkout@cbb722410c2e876e24abbe8de2cc27693e501dcb
         with:
           repository: ral-facilities/object-storage-api
           ref: develop
-          path: object-storage-api
 
       - name: Move Object Storage api repo
         run: |
@@ -169,16 +202,15 @@ jobs:
 
       - name: Start object-storage-api
         run: |
-          docker run -d -p 8002:8000 \
+          docker run -d --network=host \
           --name object_storage_api_container \
-          --network object-storage-api_default \
           --env AUTHENTICATION__ENABLED=false \
           --env API__TITLE="Object Storage Service API" \
           --env API__DESCRIPTION="This is the API for the Object Storage Service" \
           --env DATABASE__PROTOCOL="mongodb" \
           --env DATABASE__USERNAME="root" \
           --env DATABASE__PASSWORD="example" \
-          --env DATABASE__HOST_AND_OPTIONS="object-storage-api-mongodb:27017" \
+          --env DATABASE__HOST_AND_OPTIONS="localhost:27018/?authMechanism=SCRAM-SHA-256&authSource=admin" \
           --env DATABASE__NAME="object-storage" \
           --env API__ALLOWED_CORS_HEADERS='["*"]' \
           --env API__ALLOWED_CORS_ORIGINS='["*"]' \
@@ -190,12 +222,6 @@ jobs:
           --env OBJECT_STORAGE__PRESIGNED_URL_EXPIRY_SECONDS=1800 \
           --env ATTACHMENT__MAX_SIZE_BYTES=104857600 \
           --env IMAGE__THUMBNAIL_MAX_SIZE_PIXELS=300 \
-          --env ATTACHMENT__ALLOWED_FILE_EXTENSIONS='[".csv", ".doc", ".docx", ".ods", ".odt", ".rtf", ".pdf", ".txt", ".xls", ".xlsx"]' \
-          --env ATTACHMENT__UPLOAD_LIMIT=50 \
-          --env IMAGE__ALLOWED_FILE_EXTENSIONS='[".bmp", ".jpe", ".jpeg", ".jpg", ".png", ".tif", ".tiff", ".webp"]' \
-          --env IMAGE__UPLOAD_LIMIT=100 \
-          --add-host "localhost:host-gateway" \
-          --volume /home/runner/work/inventory-management-system/object-storage-api/logging.example.ini:/app/logging.ini \
           harbor.stfc.ac.uk/scd-object-storage-api/object-storage-api:develop
 
       - name: Checkout repo
@@ -214,26 +240,14 @@ jobs:
       - name: Run e2e tests
         run: yarn e2e:api
 
-      - name: Output docker logs (ims mongodb)
+      - name: Output docker logs (mongodb)
         if: failure()
-        run: docker logs ims-api-mongodb
+        run: docker logs ims_api_mongodb_container
 
-      - name: Output docker logs (ims api)
+      - name: Output docker logs (api)
         if: failure()
         run: docker logs inventory_management_system_api_container
 
-      - name: Output docker logs (object-storage mongodb)
-        if: failure()
-        run: docker logs object-storage-api-mongodb
-
-      - name: Output docker logs (object-storage minio)
-        if: failure()
-        run: docker logs object-storage-minio
-
-      - name: Output docker logs (object-storage api)
-        if: failure()
-        run: docker logs object_storage_api_container
-
       - name: Upload Cypress screenshots
         if: failure()
         uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4