Skip to content

Commit e811220

Browse files
stakachclaude
andcommitted
chore(deps): track placeos-models master after auth-replacement merge
The OAuthToken model + migration that lived on the auth-replacement branch have been merged into placeos-models master (now at 9.91.0). Switch all three pin points back to master: * shard.yml — drop the `branch: auth-replacement` pin * shard.override.yml — drop the placeos-models override entirely * spec/migration/Dockerfile — `--branch master` (parameterised via PLACEOS_MODELS_REF build ARG so we can still target an in-flight branch when iterating on schema changes) shard.lock regenerated; resolves placeos-models@9.91.0 with the oauth_tokens migration and OAuthToken model both on master. 42/42 specs pass (./test, with --no-cache migrator rebuild). Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
1 parent 1b478f6 commit e811220

4 files changed

Lines changed: 12 additions & 14 deletions

File tree

shard.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -157,9 +157,9 @@ shards:
157157
git: https://github.com/place-labs/log-backend.git
158158
version: 0.13.0
159159

160-
placeos-models: # Overridden
160+
placeos-models:
161161
git: https://github.com/placeos/models.git
162-
version: 9.90.1+git.commit.6fec65a359cb54a6ed20e2492fbff529faedaf2c
162+
version: 9.91.0
163163

164164
pool:
165165
git: https://github.com/ysbaddaden/pool.git

shard.override.yml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,4 @@
11
dependencies:
2-
# placeos-models tracks the `auth-replacement` branch while migrations
3-
# for authly's token store / OIDC tables land. Once those are merged
4-
# into master and a release cut, this override can be removed.
5-
placeos-models:
6-
github: placeos/models
7-
branch: auth-replacement
8-
92
secrets-env:
103
github: spider-gazelle/secrets-env
114

shard.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,12 @@ dependencies:
1616
pg-orm:
1717
github: spider-gazelle/pg-orm
1818

19-
# PlaceOS data models (User, Authority, ApiKey, OAuthAuthentication, SamlAuthentication, ...)
19+
# PlaceOS data models (User, Authority, ApiKey, OAuthAuthentication,
20+
# SamlAuthentication, OAuthToken, ...). The `OAuthToken` migration
21+
# landed on master with the auth-replacement merge, so this tracks
22+
# master like the rest of the PlaceOS stack.
2023
placeos-models:
2124
github: placeos/models
22-
branch: auth-replacement
2325

2426
# OAuth2 client (replaces OmniAuth :oauth2 / :developer)
2527
# NOTE: must match the source `multi_auth_saml` pins transitively

spec/migration/Dockerfile

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,12 @@ WORKDIR /app
44

55
COPY . /app
66

7-
# auth.cr pins models to the `auth-replacement` branch while migrations
8-
# are landing for authly's token store and OIDC request tables.
9-
RUN git clone --branch auth-replacement https://github.com/PlaceOS/models
7+
# Pulls the latest placeos-models master and applies every migration —
8+
# including the `oauth_tokens` table the auth.cr token store needs.
9+
# Override at build time with `--build-arg PLACEOS_MODELS_REF=<branch>`
10+
# if you need to test against an in-flight model branch.
11+
ARG PLACEOS_MODELS_REF=master
12+
RUN git clone --branch "${PLACEOS_MODELS_REF}" https://github.com/PlaceOS/models
1013
RUN mv ./models/migration/db ./db
1114

1215
ENV PATH=/app/bin:$PATH

0 commit comments

Comments
 (0)