Skip to content

Commit f1e023e

Browse files
committed
Merge branch 'main' into met-809-kosaraju
# Conflicts: # Cargo.lock # deno.lock # tests/prisma-migrations/migration-failure-test-dev/main/20250430193822_generated/migration.sql # tests/prisma-migrations/migration-failure-test-dev/main/20250606234135_generated/migration.sql # tests/prisma-migrations/migration-failure-test-dev/main/20250618092719_generated/migration.sql # tools/tree-view-web.ts
2 parents 46a9589 + b8b8820 commit f1e023e

File tree

274 files changed

+13871
-5469
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

274 files changed

+13871
-5469
lines changed

.ghjk/deno.jsonc

Lines changed: 0 additions & 9 deletions
This file was deleted.

.ghjk/deno.lock

Lines changed: 1 addition & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.ghjk/lock.json

Lines changed: 198 additions & 42 deletions
Large diffs are not rendered by default.

.github/workflows/publish-website.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,13 @@ jobs:
2929
runs-on: ubuntu-22.04
3030
steps:
3131
- uses: actions/checkout@v4
32-
- uses: metatypedev/setup-ghjk@318209a9d215f70716a4ac89dbeb9653a2deb8bc
32+
33+
# - uses: metatypedev/setup-ghjk@318209a9d215f70716a4ac89dbeb9653a2deb8bc
34+
- run: curl -fsSL https://raw.githubusercontent.com/metatypedev/ghjk/$GHJK_VERSION/install.sh | bash
35+
- run: echo "$HOME/.local/bin" >> "$GITHUB_PATH"
36+
- run: echo "BASH_ENV=$HOME/.local/share/ghjk/env.sh" >> "$GITHUB_ENV"
37+
- run: ghjk envs cook
38+
3339
- uses: actions/cache@v4
3440
with:
3541
path: .venv

.github/workflows/release.yml

Lines changed: 27 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,13 @@ jobs:
3434
- uses: WyriHaximus/[email protected]
3535
id: latest-tag
3636
- uses: kenji-miyake/setup-git-cliff@v2
37-
- uses: metatypedev/setup-ghjk@318209a9d215f70716a4ac89dbeb9653a2deb8bc
37+
38+
# - uses: metatypedev/setup-ghjk@318209a9d215f70716a4ac89dbeb9653a2deb8bc
39+
- run: curl -fsSL "https://raw.githubusercontent.com/metatypedev/ghjk/$GHJK_VERSION/install.sh" | bash
40+
- run: echo "$HOME/.local/bin" >> "$GITHUB_PATH"
41+
- run: echo "BASH_ENV=$HOME/.local/share/ghjk/env.sh" >> "$GITHUB_ENV"
42+
- run: ghjk envs cook
43+
3844
- shell: bash
3945
run: |
4046
VERSION=$(ghjk x version-print)
@@ -52,7 +58,7 @@ jobs:
5258
makeLatest: true
5359
bodyFile: "CHANGE.md"
5460
discussionCategory: "Announcements"
55-
prerelease: ${{ contains(steps.latest-tag.outputs.tag, 'dev') || contains(steps.latest-tag.outputs.tag, 'alpha') }}
61+
prerelease: ${{ contains(steps.latest-tag.outputs.tag, 'dev') || contains(steps.latest-tag.outputs.tag, 'rc') }}
5662

5763
pub-meta-cli:
5864
needs:
@@ -97,7 +103,11 @@ jobs:
97103
with:
98104
fetch-depth: 0
99105
# some targets don't use cross so will require the deps in the host
100-
- uses: metatypedev/setup-ghjk@318209a9d215f70716a4ac89dbeb9653a2deb8bc
106+
- run: curl -fsSL "https://raw.githubusercontent.com/metatypedev/ghjk/$GHJK_VERSION/install.sh" | bash
107+
- run: echo "$HOME/.local/bin" >> "$GITHUB_PATH"
108+
- run: echo "BASH_ENV=$HOME/.local/share/ghjk/env.sh" >> "$GITHUB_ENV"
109+
- run: ghjk envs cook
110+
101111
- uses: WyriHaximus/[email protected]
102112
id: latest-tag
103113
- uses: dsherret/rust-toolchain-file@v1
@@ -172,7 +182,13 @@ jobs:
172182
id: latest-tag
173183
- uses: dsherret/rust-toolchain-file@v1
174184
- uses: mozilla-actions/[email protected]
175-
- uses: metatypedev/setup-ghjk@318209a9d215f70716a4ac89dbeb9653a2deb8bc
185+
186+
# - uses: metatypedev/setup-ghjk@318209a9d215f70716a4ac89dbeb9653a2deb8bc
187+
- run: curl -fsSL "https://raw.githubusercontent.com/metatypedev/ghjk/$GHJK_VERSION/install.sh" | bash
188+
- run: echo "$HOME/.local/bin" >> "$GITHUB_PATH"
189+
- run: echo "BASH_ENV=$HOME/.local/share/ghjk/env.sh" >> "$GITHUB_ENV"
190+
- run: ghjk envs cook
191+
176192
- shell: bash
177193
env:
178194
POETRY_PYPI_TOKEN_PYPI: ${{ secrets.PYPI_TOKEN }}
@@ -305,7 +321,13 @@ jobs:
305321
fetch-depth: 0
306322
- uses: dsherret/rust-toolchain-file@v1
307323
- uses: kenji-miyake/setup-git-cliff@v2
308-
- uses: metatypedev/setup-ghjk@318209a9d215f70716a4ac89dbeb9653a2deb8bc
324+
325+
# - uses: metatypedev/setup-ghjk@318209a9d215f70716a4ac89dbeb9653a2deb8bc
326+
- run: curl -fsSL "https://raw.githubusercontent.com/metatypedev/ghjk/$GHJK_VERSION/install.sh" | bash
327+
- run: echo "$HOME/.local/bin" >> "$GITHUB_PATH"
328+
- run: echo "BASH_ENV=$HOME/.local/share/ghjk/env.sh" >> "$GITHUB_ENV"
329+
- run: ghjk envs cook
330+
309331
- id: bump
310332
run: |
311333
ghjk x version-bump prerelease

.github/workflows/tests.yml

Lines changed: 36 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ concurrency:
2727
cancel-in-progress: true
2828

2929
env:
30+
# GHJK_LOG: "debug"
3031
GHJK_VERSION: "v0.2.2"
3132
GHJK_ENV: "ci"
3233
RUST_BACKTRACE: "full"
@@ -86,7 +87,13 @@ jobs:
8687
run: echo "RUSTC_WRAPPER=sccache" >> $GITHUB_ENV
8788
- if: ${{ env.AWS_ACCESS_KEY_ID != '' }}
8889
uses: mozilla-actions/[email protected]
89-
- uses: metatypedev/setup-ghjk@318209a9d215f70716a4ac89dbeb9653a2deb8bc
90+
91+
# - uses: metatypedev/setup-ghjk@318209a9d215f70716a4ac89dbeb9653a2deb8bc
92+
- run: curl -fsSL "https://raw.githubusercontent.com/metatypedev/ghjk/$GHJK_VERSION/install.sh" | bash
93+
- run: echo "$HOME/.local/bin" >> "$GITHUB_PATH"
94+
- run: echo "BASH_ENV=$HOME/.local/share/ghjk/env.sh" >> "$GITHUB_ENV"
95+
- run: ghjk envs cook
96+
9097
- shell: bash
9198
run: |
9299
sudo apt update && sudo apt install -y --no-install-recommends libclang-dev clang
@@ -129,10 +136,16 @@ jobs:
129136
run: echo "RUSTC_WRAPPER=sccache" >> $GITHUB_ENV
130137
- if: ${{ env.AWS_ACCESS_KEY_ID != '' }}
131138
uses: mozilla-actions/[email protected]
132-
- uses: metatypedev/setup-ghjk@318209a9d215f70716a4ac89dbeb9653a2deb8bc
133-
with:
134-
# temporary fix
135-
cache-key-prefix: ${{ matrix.os }}
139+
140+
# - uses: metatypedev/setup-ghjk@318209a9d215f70716a4ac89dbeb9653a2deb8bc
141+
# with:
142+
# # temporary fix
143+
# cache-key-prefix: ${{ matrix.os }}
144+
- run: curl -fsSL "https://raw.githubusercontent.com/metatypedev/ghjk/$GHJK_VERSION/install.sh" | bash
145+
- run: echo "$HOME/.local/bin" >> "$GITHUB_PATH"
146+
- run: echo "BASH_ENV=$HOME/.local/share/ghjk/env.sh" >> "$GITHUB_ENV"
147+
- run: ghjk envs cook
148+
136149
- if: ${{ matrix.cross }}
137150
shell: bash
138151
env:
@@ -156,7 +169,13 @@ jobs:
156169
# with:
157170
# path: ${{ env.DENO_DIR }}
158171
# key: deno-mac-${{ hashFiles('**/deno.lock') }}
159-
- uses: metatypedev/setup-ghjk@318209a9d215f70716a4ac89dbeb9653a2deb8bc
172+
173+
# - uses: metatypedev/setup-ghjk@318209a9d215f70716a4ac89dbeb9653a2deb8bc
174+
- run: curl -fsSL "https://raw.githubusercontent.com/metatypedev/ghjk/$GHJK_VERSION/install.sh" | bash
175+
- run: echo "~/.local/bin" >> $GITHUB_PATH
176+
- run: echo "BASH_ENV=~/.local/share/ghjk/env.sh" >> $GITHUB_ENV
177+
- run: ghjk envs cook
178+
160179
- name: Cache .venv dir
161180
uses: actions/cache@v4
162181
with:
@@ -261,12 +280,19 @@ jobs:
261280
- run: |
262281
sudo apt update
263282
sudo apt install -y --no-install-recommends zstd
264-
- uses: metatypedev/setup-ghjk@318209a9d215f70716a4ac89dbeb9653a2deb8bc
265-
with:
266-
cache-disable: true
283+
284+
# - uses: metatypedev/setup-ghjk@318209a9d215f70716a4ac89dbeb9653a2deb8bc
285+
# with:
286+
# cache-disable: true
287+
- run: curl -fsSL "https://raw.githubusercontent.com/metatypedev/ghjk/$GHJK_VERSION/install.sh" | bash
288+
- run: echo "~/.local/bin" >> $GITHUB_PATH
289+
- run: echo "BASH_ENV=~/.local/share/ghjk/env.sh" >> $GITHUB_ENV
290+
- run: ghjk envs cook
291+
267292
- shell: bash
268293
run: |
269294
# the big run
295+
set -x
270296
271297
# we don't want bash sub shells to do ghjk_reload
272298
# TODO: consider disabling ghjk_reload on non-interactive shells
@@ -311,7 +337,7 @@ jobs:
311337
src/typegraph/deno/src/*.ts \
312338
tools/*.ts
313339
314-
deno --unstable-worker-options --unstable-net coverage ./coverage --lcov > coverage.lcov
340+
deno coverage --unstable-worker-options --unstable-net ./coverage --lcov > coverage.lcov
315341
316342
# we need secrets for coverage so we skip if not avail
317343
# this applies to dedpendabot PRs for example

.pre-commit-config.yaml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -39,23 +39,23 @@ repos:
3939
- id: deno-lint
4040
name: Deno lint
4141
language: system
42-
entry: bash -c 'deno lint && ghjk x lint-deno'
42+
entry: bash -c 'ghjk x lint-deno'
4343
pass_filenames: false
44-
types:
45-
- javascript
46-
- ts
47-
- tsx
48-
- json
49-
- yaml
50-
files: ^(src/typegate|tools)/
44+
# types:
45+
# - javascript
46+
# - ts
47+
# - tsx
48+
# - json
49+
# - yaml
50+
# files: ^(src/typegate|tools)/
5151
- id: es-lint
5252
name: Eslint website
5353
language: system
5454
entry: bash -c 'cd ./docs/metatype.dev/ && [ -f node_modules/.bin/eslint ] && pnpm lint && pnpm prettier'
5555
pass_filenames: false
56-
types_or:
57-
- ts
58-
- tsx
56+
# types_or:
57+
# - ts
58+
# - tsx
5959
files: ^docs/metatype.dev
6060
#- id: cargo-udeps
6161
# name: Check for unused cargo dependencies

.vscode/settings.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
],
1313
"deno.config": "deno.jsonc",
1414
"deno.unstable": true,
15+
"deno.path": "./.ghjk/envs/dev/shims/bin/deno",
1516
"deno.codeLens.implementations": true,
1617
"deno.codeLens.references": true,
1718
"deno.codeLens.referencesAllFunctions": true,
@@ -64,5 +65,6 @@
6465
"python.analysis.extraPaths": [
6566
"./src/typegraph/python"
6667
],
67-
"prettier.proseWrap": "never"
68+
"prettier.proseWrap": "never",
69+
"deno.enable": true
6870
}

0 commit comments

Comments
 (0)