Switch to bun for almost everything.

cubing · Jan 14, 2024 · c915b83 · c915b83
1 parent 6cba983
commit c915b83
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/.github/workflows/pages.yml b/.github/workflows/pages.yml
@@ -24,6 +24,9 @@ jobs:
         uses: actions/setup-node@v1
         with:
           node-version: ${{ matrix.node-version }}
+      - uses: oven-sh/setup-bun@v1
+        with:
+          bun-version: latest
       - run: make setup
       - run: make build-site-docs
       - name: Upload artifact

diff --git a/Makefile b/Makefile
@@ -164,7 +164,7 @@ test-dist-lib-node-import: build-lib-js
 	${NODE} script/test/dist/lib/cubing/node/import/main.js
 .PHONY: test-dist-lib-bun-scramble-all-events
 test-dist-lib-bun-scramble-all-events: build-lib-js
-	${BUN} script/test/dist/lib/cubing/node/scramble-all-events/main.js # TODO: why does this fail in `bun`?
+	${BUN} script/test/dist/lib/cubing/node/scramble-all-events/main.js
 .PHONY: test-dist-lib-perf
 test-dist-lib-perf: build-lib-js
 	${BUN} script/test/dist/lib/cubing/perf/*.js
@@ -178,7 +178,7 @@ test-dist-lib-build-size: build-lib-js
 test-dist-sites-experiments: playwright-install build-sites
 	${BUN} ./script/test/dist/sites/experiments.cubing.net/main.js
 .PHONY: test-dist-bin
-test-dist-bin: test-dist-bin-shebang test-dist-bin-npm-exec test-dist-bin-bunx
+test-dist-bin: test-dist-bin-shebang test-dist-bin-npm-exec
 .PHONY: test-dist-bin-shebang
 test-dist-bin-shebang: build-bin
 	# Note: we're not testing the output, just that these don't exit with an error.
@@ -188,9 +188,6 @@ test-dist-bin-shebang: build-bin
 .PHONY: test-dist-bin-npm-exec
 test-dist-bin-npm-exec: build-bin
 	time ${NPM} exec scramble -- 222
-.PHONY: test-dist-bin-bunx
-test-dist-bin-bunx: build-bin
-	time ${BUN} x scramble 222 # TODO: why doesn't `bun x` take `--`?
 .PHONY: format
 format:
 	${BIOME} format --write ./script ./src

diff --git a/package.json b/package.json
@@ -143,7 +143,6 @@
     "test-dist-bin": "make test-dist-bin",
     "test-dist-bin-shebang": "make test-dist-bin-shebang",
     "test-dist-bin-npm-exec": "make test-dist-bin-npm-exec",
-    "test-dist-bin-bunx": "make test-dist-bin-bunx",
     "format": "make format",
     "setup": "make setup",
     "quick-setup": "make quick-setup",