Fix merge conflicts: consistent CI-time sync approach

- Resolve 5 merge conflicts favoring CI-time generation approach
- Fix .gitignore to match actual paths (src/*/common-setup.sh, not _lib/)
- Untrack per-feature common-setup.sh copies (now gitignored, generated by CI)
- Update docs to reference correct test path (test/_global/)

Author: abdurriq

.github/workflows/docker-in-docker-stress-test.yaml

@@ -15,6 +15,9 @@ jobs:
     steps:
       - uses: actions/checkout@v6
 
+      - name: "Sync shared scripts into features"
+        run: bash scripts/sync-common-setup.sh
+
       - name: "Install latest devcontainer CLI"
         run: npm install -g @devcontainers/cli
 
@@ -30,6 +33,9 @@ jobs:
     steps:
       - uses: actions/checkout@v6
 
+      - name: "Sync shared scripts into features"
+        run: bash scripts/sync-common-setup.sh
+
       - name: "Install latest devcontainer CLI"
         run: npm install -g @devcontainers/cli
 

.github/workflows/release.yaml

@@ -15,6 +15,9 @@ jobs:
     steps:
       - uses: actions/checkout@v6
 
+      - name: "Sync shared scripts into features"
+        run: bash scripts/sync-common-setup.sh
+
       - name: "Publish"
         uses: devcontainers/action@v1
         with:

.github/workflows/test-all.yaml

@@ -54,11 +54,14 @@ jobs:
     steps:
       - uses: actions/checkout@v6
 
+      - name: "Sync shared scripts into features"
+        run: bash scripts/sync-common-setup.sh
+
       - name: "Install latest devcontainer CLI"
         run: npm install -g @devcontainers/cli
 
       - name: "Generating tests for '${{ matrix.features }}' against '${{ matrix.baseImage }}'"
-        run: devcontainer features test  --skip-scenarios -f ${{ matrix.features }} -i ${{ matrix.baseImage }} .
+        run: devcontainer features test --skip-scenarios -f ${{ matrix.features }} -i ${{ matrix.baseImage }} .
 
   test-scenarios:
     runs-on: ubuntu-latest
@@ -98,6 +101,9 @@ jobs:
     steps:
       - uses: actions/checkout@v6
 
+      - name: "Sync shared scripts into features"
+        run: bash scripts/sync-common-setup.sh
+
       - name: "Install latest devcontainer CLI"
         run: npm install -g @devcontainers/cli
 
@@ -110,6 +116,9 @@ jobs:
     steps:
       - uses: actions/checkout@v6
 
+      - name: "Sync shared scripts into features"
+        run: bash scripts/sync-common-setup.sh
+
       - name: "Install latest devcontainer CLI"
         run: npm install -g @devcontainers/cli
 

.github/workflows/test-manual.yaml

@@ -21,6 +21,9 @@ jobs:
     steps:
       - uses: actions/checkout@v6
 
+      - name: "Sync shared scripts into features"
+        run: bash scripts/sync-common-setup.sh
+
       - name: "Install latest devcontainer CLI"
         run: npm install -g @devcontainers/cli
 

.github/workflows/test-pr-arm64.yaml

@@ -44,6 +44,9 @@ jobs:
     steps:
       - uses: actions/checkout@v6
 
+      - name: "Sync shared scripts into features"
+        run: bash scripts/sync-common-setup.sh
+
       - name: "Install latest devcontainer CLI"
         run: npm install -g @devcontainers/cli
 
@@ -60,6 +63,9 @@ jobs:
     steps:
       - uses: actions/checkout@v6
 
+      - name: "Sync shared scripts into features"
+        run: bash scripts/sync-common-setup.sh
+
       - name: "Install latest devcontainer CLI"
         run: npm install -g @devcontainers/cli
 

.github/workflows/test-pr.yaml

@@ -70,6 +70,9 @@ jobs:
     steps:
       - uses: actions/checkout@v6
 
+      - name: "Sync shared scripts into features"
+        run: bash scripts/sync-common-setup.sh
+
       - name: "Install latest devcontainer CLI"
         run: npm install -g @devcontainers/cli
 
@@ -86,6 +89,9 @@ jobs:
     steps:
       - uses: actions/checkout@v6
 
+      - name: "Sync shared scripts into features"
+        run: bash scripts/sync-common-setup.sh
+
       - name: "Install latest devcontainer CLI"
         run: npm install -g @devcontainers/cli
 

.gitignore

@@ -1 +1,4 @@
-workspace.code-workspace
+workspace.code-workspace
+
+# Auto-generated by scripts/sync-common-setup.sh at CI/build time
+src/*/common-setup.sh

.rebase-continue.sh

@@ -8,26 +8,26 @@ Multiple features need the same helper functions (e.g., user selection logic). T
 
 ## Solution
 
-We maintain a **single source of truth** with a **sync mechanism** to deploy to each feature:
+We maintain a **single source of truth** with a **CI-time sync mechanism** to deploy to each feature:
 
 ### Single Source
 - **Location**: `scripts/lib/common-setup.sh`
 - **Contains**: Shared helper functions (currently user selection logic)
 - **Maintenance**: All updates happen here
 
 ### Deployment
-- **Mechanism**: `scripts/sync-common-setup.sh`
-- **Target**: Copies to each feature's directory as `common-setup.sh`
+- **Mechanism**: `scripts/sync-common-setup.sh` (runs automatically in CI)
+- **Target**: Copies to each feature's directory as `common-setup.sh` at build/test time
 - **Reason**: Devcontainer packaging requires files to be within each feature's directory
+- **Note**: The copies are `.gitignore`d — only the source file is tracked in git
 
 ## Workflow
 
 ### Making Changes
 
 1. **Edit the source**: Modify `scripts/lib/common-setup.sh`
 2. **Test**: Run `bash test/_global/test-common-setup.sh`
-3. **Sync**: Run `./scripts/sync-common-setup.sh`
-4. **Commit**: Include both source and deployed copies
+3. **Commit**: Only the source file needs to be committed
 
 ```bash
 # Edit the source
@@ -36,25 +36,25 @@ vim scripts/lib/common-setup.sh
 # Test
 bash test/_global/test-common-setup.sh
 
-# Deploy to all features
-./scripts/sync-common-setup.sh
-
-# Commit everything
-git add scripts/lib/common-setup.sh src/*/common-setup.sh
+# Commit just the source
+git add scripts/lib/common-setup.sh
 git commit -m "Update common-setup.sh helper function"
 ```
 
-### Verification
+### Local Development
 
-The sync script is idempotent - running it multiple times with the same source produces the same result. After syncing, you can verify:
+To generate the copies locally (e.g., for testing features outside CI):
 
 ```bash
-# Check that all copies are identical
-for f in src/*/common-setup.sh; do
-    diff -q scripts/lib/common-setup.sh "$f" || echo "MISMATCH: $f"
-done
+./scripts/sync-common-setup.sh
 ```
 
+### CI Integration
+
+All CI workflows (test, release, stress test) automatically run `sync-common-setup.sh`
+after checkout and before the devcontainer CLI packages features. This ensures the
+copies are always present and up-to-date without tracking them in git.
+
 ## Why Not Use Shared Files?
 
 The devcontainer CLI packages each feature independently. When a feature is installed:
@@ -81,10 +81,10 @@ The devcontainer spec has a proposal for an `include` property in `devcontainer-
 
 As of this PR:
 - **Source**: `scripts/lib/common-setup.sh` (87 lines)
-- **Deployed**: 16 features, each with `src/FEATURE/common-setup.sh`
-- **Sync Script**: `scripts/sync-common-setup.sh`
+- **Deployed**: 16 features, each with `src/FEATURE/common-setup.sh` (generated at CI time, gitignored)
+- **Sync Script**: `scripts/sync-common-setup.sh` (called by all CI workflows)
 - **Tests**: `test/_global/test-common-setup.sh` (14 test cases)
-- **Benefits**: Eliminated ~188 lines of inline duplicated logic from install scripts
+- **Benefits**: Eliminated ~188 lines of inline duplicated logic from install scripts, zero duplicate files tracked in git
 
 ## References
 

SHARED_CODE.md

@@ -19,23 +19,15 @@ scripts/
 
 ### Deploying Changes
 
-Due to the devcontainer CLI's packaging behavior (each feature is packaged independently), the helper must be deployed to each feature's directory. We maintain this through a sync script:
+Due to the devcontainer CLI's packaging behavior (each feature is packaged independently), the helper must be present in each feature's directory at packaging time. This is handled automatically by CI — all workflows run `scripts/sync-common-setup.sh` after checkout and before packaging.
 
-```bash
-./scripts/sync-common-setup.sh
-```
-
-This copies `scripts/lib/common-setup.sh` to all features:
-- `src/anaconda/common-setup.sh`
-- `src/docker-in-docker/common-setup.sh`
-- etc.
+The copies are `.gitignore`d — only the source file is tracked in git.
 
 ### Workflow
 
 1. **Edit**: Make changes to `scripts/lib/common-setup.sh`
 2. **Test**: Run `bash test/_global/test-common-setup.sh` to verify
-3. **Sync**: Run `./scripts/sync-common-setup.sh` to deploy to all features
-4. **Commit**: Commit both the source and all copies together
+3. **Commit**: Only the source file needs to be committed
 
 ### Why Copies?
 
@@ -48,12 +40,20 @@ Therefore, each feature needs its own copy of the helper to ensure it's availabl
 
 ## Testing
 
-Tests are located in `test/_global/` and reference the source of truth directly:
+Tests are located in `test/_global/` and source from the canonical `scripts/lib/common-setup.sh`:
 
 ```bash
 bash test/_global/test-common-setup.sh
 ```
 
+### Local Development
+
+To generate the copies locally (e.g., for testing features outside CI):
+
+```bash
+./scripts/sync-common-setup.sh
+```
+
 ## Future
 
 This approach is a workaround for the current limitation. The devcontainer spec has a proposal for an `include` property in `devcontainer-feature.json` that would allow native code sharing (see [devcontainers/spec#129](https://github.com/devcontainers/spec/issues/129)). Once implemented, this sync mechanism can be removed.