Skip to content

Dbp table mismatch #1798

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Aug 11, 2025
Merged

Dbp table mismatch #1798

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
8949f20
Change table load to retain original header row, for improved errors
dbp Jun 27, 2025
b45ba92
Update Image polyfill.
jpolitz Jul 21, 2025
848438c
remove this test until this service comes back or we write our own ti…
jpolitz Jul 22, 2025
cbaeadf
fix: use npx exec in Makefile
ironm00n Jul 21, 2025
f4d4fee
bump deps
ironm00n Jul 21, 2025
147d5b9
add jest as dev dep
ironm00n Jul 21, 2025
2c81c68
use lockfile for github actions
ironm00n Jul 22, 2025
d395189
reorder result tuple for backwards compatibility. put orig-headers in…
jpolitz Aug 1, 2025
fe8d9a8
Test for rendering expected and actual columns in header-mismatch
jpolitz Aug 1, 2025
297e385
Make this backwards-compatible with clients that didn't know about or…
jpolitz Aug 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions .github/workflows/build-and-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,8 @@ jobs:
with:
node-version: 24

- name: udpate and install
run: |
npm update
- name: install
run:
make install

- name: build
Expand Down
19 changes: 7 additions & 12 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
PYRET_COMP0 = build/phase0/pyret.jarr
NODE = node -max-old-space-size=8192
NPM_EXEC = npm --prefix . exec --no --
JS = js
JSBASE = $(JS)/base
JSTROVE = $(JS)/trove
Expand All @@ -12,8 +13,6 @@ PHASEA = build/phaseA
PHASEB = build/phaseB
PHASEC = build/phaseC
BUNDLED_DEPS = build/bundled-node-deps.js
# HACK HACK HACK (See https://github.com/npm/npm/issues/3738)
export PATH := ./node_modules/.bin:../node_modules/.bin:../../node_modules/.bin:$(PATH)
SHELL := /usr/bin/env bash

# CUSTOMIZE THESE IF NECESSARY
Expand Down Expand Up @@ -116,13 +115,13 @@ $(PHASEC)/pyret.jarr: $(PHASEB)/pyret.jarr $(PHASEC_ALL_DEPS) $(patsubst src/%,$
show-comp: build/show-compilation.jarr

$(PHASEA)/bundled-node-compile-deps.js: src/js/trove/require-node-compile-dependencies.js
npx browserify src/js/trove/require-node-compile-dependencies.js -o $@
$(NPM_EXEC) browserify src/js/trove/require-node-compile-dependencies.js -o $@
$(PHASEA)/bundled-node-deps.js: src/js/trove/require-node-dependencies.js
npx browserify src/js/trove/require-node-dependencies.js -o $@
$(NPM_EXEC) browserify src/js/trove/require-node-dependencies.js -o $@
$(PHASEB)/bundled-node-compile-deps.js: src/js/trove/require-node-compile-dependencies.js
npx browserify src/js/trove/require-node-compile-dependencies.js -o $@
$(NPM_EXEC) browserify src/js/trove/require-node-compile-dependencies.js -o $@
$(PHASEC)/bundled-node-compile-deps.js: src/js/trove/require-node-compile-dependencies.js
npx browserify src/js/trove/require-node-compile-dependencies.js -o $@
$(NPM_EXEC) browserify src/js/trove/require-node-compile-dependencies.js -o $@

$(PHASEA)/config.json: src/scripts/node_modules-config.json
cp $< $@
Expand All @@ -131,12 +130,8 @@ $(PHASEB)/config.json: src/scripts/node_modules-config.json
$(PHASEC)/config.json: src/scripts/node_modules-config.json
cp $< $@

showpath:
@echo my new PATH = $(PATH)
@echo `which browserify`

$(BUNDLED_DEPS): src/js/trove/require-node-dependencies.js
npx browserify src/js/trove/require-node-dependencies.js -o $(BUNDLED_DEPS)
$(NPM_EXEC) browserify src/js/trove/require-node-dependencies.js -o $(BUNDLED_DEPS)

build/show-compilation.jarr: $(PHASEA)/pyret.jarr src/scripts/show-compilation.arr
$(NODE) $(PHASEA)/pyret.jarr --outfile build/show-compilation.jarr \
Expand Down Expand Up @@ -277,7 +272,7 @@ pyret-test: phaseA tests/pyret/main2.jarr

.PHONY : pyret-io-test
pyret-io-test: phaseA
npx jest --detectOpenHandles --forceExit --verbose "tests/io-tests/io.test.js"
$(NPM_EXEC) jest --detectOpenHandles --forceExit --verbose "tests/io-tests/io.test.js"

.PHONY : regression-test
regression-test: tests/pyret/regression.jarr
Expand Down
Loading