From 59fdcd123ad86a78c05a59a8ad6e627d2f36b49c Mon Sep 17 00:00:00 2001
From: Chris Coutinho <chris@coutinho.io>
Date: Fri, 27 Feb 2026 20:51:36 +0100
Subject: [PATCH] fix(ci): keep third_party mount, always build submodules in
 CI

The third_party volume mount is required for astrolabe/notes/oidc
development. Always checkout submodules and build the OIDC app in
all CI matrix jobs since the app container needs it.

Remove the docker-compose.oidc.yml override (no longer needed).

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 .github/workflows/test.yml | 12 +++---------
 docker-compose.oidc.yml    |  7 -------
 docker-compose.yml         |  2 +-
 3 files changed, 4 insertions(+), 17 deletions(-)
 delete mode 100644 docker-compose.oidc.yml

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 85b0c78..8cc02f6 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -39,21 +39,18 @@ jobs:
             profile: single-user
             markers: "smoke or (integration and not oauth and not keycloak and not login_flow)"
             wait-port: 8000
-            needs-oidc: false
             needs-playwright: false
 
           - mode: oauth
             profile: oauth
             markers: "oauth and not keycloak"
             wait-port: 8001
-            needs-oidc: true
             needs-playwright: true
 
           - mode: login-flow
             profile: login-flow
             markers: "login_flow"
             wait-port: 8004
-            needs-oidc: true
             needs-playwright: true
 
     name: integration (${{ matrix.mode }})
@@ -61,28 +58,25 @@ jobs:
     steps:
       - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
-          submodules: ${{ matrix.needs-oidc && 'true' || 'false' }}
+          submodules: 'true'
 
-      # Build OIDC app (required for OAuth and Login Flow modes)
+      # Build OIDC app (third_party is always mounted into the app container)
       - name: Set up PHP 8.4
-        if: matrix.needs-oidc
         uses: shivammathur/setup-php@44454db4f0199b8b9685a5d763dc37cbf79108e1 # 2.36.0
         with:
           php-version: 8.4
           coverage: none
 
       - name: Install OIDC app composer dependencies
-        if: matrix.needs-oidc
         run: |
           cd third_party/oidc
           composer install --no-dev
 
       # Start services with the appropriate profile
-      # OIDC modes need the override file to mount third_party into Nextcloud
       - name: Run docker compose
         uses: hoverkraft-tech/compose-action@4894d2492015c1774ee5a13a95b1072093087ec3 # v2.5.0
         with:
-          compose-file: ${{ matrix.needs-oidc && './docker-compose.yml\n./docker-compose.oidc.yml' || './docker-compose.yml' }}
+          compose-file: "./docker-compose.yml"
           compose-flags: "--profile ${{ matrix.profile }}"
           up-flags: "--build"
 
diff --git a/docker-compose.oidc.yml b/docker-compose.oidc.yml
deleted file mode 100644
index 65482e1..0000000
--- a/docker-compose.oidc.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-# Override to mount the OIDC app into Nextcloud.
-# Use with: docker compose -f docker-compose.yml -f docker-compose.oidc.yml --profile <profile> up
-# Required for OAuth, Keycloak, and Login Flow profiles.
-services:
-  app:
-    volumes:
-      - ./third_party:/opt/apps:ro
diff --git a/docker-compose.yml b/docker-compose.yml
index 3edabe6..455ecc1 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -35,7 +35,7 @@ services:
       - ./app-hooks:/docker-entrypoint-hooks.d:ro
       # Mount OIDC development directory outside /var/www/html to avoid rsync conflicts
       # The post-installation hook will register /opt/apps as an additional app directory
-      #- ./third_party:/opt/apps:ro
+      - ./third_party:/opt/apps:ro
     environment:
       - NEXTCLOUD_TRUSTED_DOMAINS=app
       - NEXTCLOUD_ADMIN_USER=admin