Skip to content

Commit 7be1a3b

Browse files
committed
Merge branch 'main' into feat/new-comapeocat-format
* main: chore: release workflow fixes (#1151) fix: Blocked members only expect auth core for initial sync (#1138) chore: cleanup drizzle types (#1141)
2 parents 0bfce0d + 2bd3528 commit 7be1a3b

13 files changed

Lines changed: 303 additions & 240 deletions

File tree

.github/workflows/release.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,16 @@ on:
1414
- minor
1515
- major
1616
- prerelease
17-
# - prepatch
18-
# - preminor
19-
# - premajor
17+
- prepatch
18+
- preminor
19+
- premajor
2020
pull_request:
2121
types: [closed]
2222
branches: [main]
2323

2424
jobs:
2525
release:
26-
if: ${{github.event_name != 'pull_request' || github.event.pull_request.merged}}
26+
if: ${{github.event_name != 'pull_request' || (github.event.pull_request.merged && github.event.pull_request.user.login == 'optic-release-automation[bot]')}}
2727
runs-on: ubuntu-latest
2828
permissions:
2929
contents: write
@@ -36,11 +36,11 @@ jobs:
3636
commit-message: 'Release {version}'
3737
sync-semver-tags: false
3838
access: 'public'
39-
# This prefix is added before the prerelease number, e.g. `v3.0.0-alpha.0`
40-
# prerelease-prefix: 'alpha'
39+
# This prefix is added before the prerelease number, e.g. `v3.0.0-next.0`
40+
prerelease-prefix: 'next'
4141
semver: ${{ github.event.inputs.semver }}
42-
# Prereleases are published under the `alpha` npm dist-tag
43-
# npm-tag: ${{ startsWith(github.event.inputs.semver, 'pre') && 'alpha' || 'latest' }}
42+
# Prereleases are published under the `next` npm dist-tag
43+
npm-tag: ${{ startsWith(github.event.inputs.semver, 'pre') && 'next' || 'latest' }}
4444
# Don't notify linked issues
4545
notify-linked-issues: false
4646
publish-mode: oidc

package-lock.json

Lines changed: 16 additions & 90 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/index-writer/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { decode } from '@comapeo/schema'
22
import SqliteIndexer from '@mapeo/sqlite-indexer'
33
import { getTableConfig } from 'drizzle-orm/sqlite-core'
4-
import { getBacklinkTableName } from '../schema/utils.js'
4+
import { getBacklinkTableName } from '../schema/comapeo-to-drizzle.js'
55
import { discoveryKey } from 'hypercore-crypto'
66
import { Logger } from '../logger.js'
77
/** @import { MapeoDoc, VersionIdObject } from '@comapeo/schema' */

0 commit comments

Comments
 (0)