Replace shared_lib submodule with shared for decoupling deploy
All checks were successful
Build and Deploy / build-and-deploy (push) Successful in 1m10s

- Swap shared_lib submodule → shared (tracking decoupling branch)
- Dockerfile: shared_lib/ → shared/, remove bp symlink hack
- CI: trigger on decoupling branch, use dynamic ref_name

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
giles
2026-02-11 13:29:28 +00:00
parent 5d0653bf2e
commit 25fc3a933c
5 changed files with 8 additions and 10 deletions

View File

@@ -2,7 +2,7 @@ name: Build and Deploy
on:
push:
branches: [main]
branches: [main, decoupling]
env:
REGISTRY: registry.rose-ash.com:5000
@@ -36,8 +36,8 @@ jobs:
run: |
ssh "root@$DEPLOY_HOST" "
cd ${{ env.REPO_DIR }}
git fetch origin main
git reset --hard origin/main
git fetch origin ${{ github.ref_name }}
git reset --hard origin/${{ github.ref_name }}
git submodule update --init --recursive
"

5
.gitmodules vendored
View File

@@ -1,3 +1,4 @@
[submodule "shared_lib"]
path = shared_lib
[submodule "shared"]
path = shared
url = https://git.rose-ash.com/coop/shared.git
branch = decoupling

View File

@@ -17,14 +17,11 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
postgresql-client \
&& rm -rf /var/lib/apt/lists/*
COPY shared_lib/requirements.txt ./requirements.txt
COPY shared/requirements.txt ./requirements.txt
RUN pip install -r requirements.txt
COPY . .
# Link app blueprints into the shared library's namespace
RUN rm -rf /app/shared_lib/suma_browser/app/bp && ln -s /app/bp /app/shared_lib/suma_browser/app/bp
# ---------- Runtime setup ----------
COPY entrypoint.sh /usr/local/bin/entrypoint.sh
RUN chmod +x /usr/local/bin/entrypoint.sh

1
shared Submodule

Submodule shared added at 4dd25526b9

Submodule shared_lib deleted from 0c9b8d6aa2