diff --git a/Makefile b/Makefile index 511bb26cdf8b63..21ba4db284479e 100644 --- a/Makefile +++ b/Makefile @@ -26,8 +26,7 @@ sign-macos-x64: sign-macos-aarch64: gon sign.macos-aarch64.json -release-macos-x64: build-obj jsc-bindings-mac bun-link-lld-release -release-macos-aarch64: build-obj jsc-bindings-mac bun-link-lld-release sign-macos-aarch64 +release-macos: build-obj jsc-bindings-mac bun-link-lld-release bin-dir: @echo $(BIN_DIR) @@ -62,11 +61,11 @@ bump: build_postinstall: @esbuild --bundle --format=cjs --platform=node --define:BUN_VERSION="\"$(PACKAGE_JSON_VERSION)\"" packages/bun-cli/scripts/postinstall.ts > packages/bun-cli/postinstall.js -write-package-json-version-cli: +write-package-json-version-cli: build_postinstall jq -S --raw-output '.version = "${PACKAGE_JSON_VERSION}"' packages/bun-cli/package.json > packages/bun-cli/package.json.new mv packages/bun-cli/package.json.new packages/bun-cli/package.json -write-package-json-version-arch: +write-package-json-version: jq -S --raw-output '.version = "${PACKAGE_JSON_VERSION}"' $(PACKAGE_DIR)/package.json > $(PACKAGE_DIR)/package.json.new mv $(PACKAGE_DIR)/package.json.new $(PACKAGE_DIR)/package.json @@ -74,7 +73,7 @@ tag: git tag $(BUN_BUILD_TAG) git push --tags -prepare-release: build_postinstall tag release-create write-package-json-version-arch write-package-json-version-cli +prepare-release: tag release-create write-package-json-version-cli write-package-json-version release-create: gh release create --title "Bun v$(PACKAGE_JSON_VERSION)" "$(BUN_BUILD_TAG)" @@ -82,10 +81,13 @@ release-create: release-cli-push: cd packages/bun-cli && npm pack --pack-destination /tmp/ gh release upload $(BUN_BUILD_TAG) --clobber /tmp/bun-cli-$(PACKAGE_JSON_VERSION).tgz + npm publish /tmp/bun-cli-$(PACKAGE_JSON_VERSION).tgz -release-macos-x64-push: +release-mac-push: cd packages/bun-cli-darwin-x64 && npm pack --pack-destination /tmp/ gh release upload $(BUN_BUILD_TAG) --clobber /tmp/bun-cli-darwin-x64-$(PACKAGE_JSON_VERSION).tgz + npm publish /tmp/bun-cli-darwin-x64-$(PACKAGE_JSON_VERSION).tgz + jsc-copy-headers: find src/JavaScript/jsc/WebKit/WebKitBuild/Release/JavaScriptCore/Headers/JavaScriptCore/ -name "*.h" -exec cp {} src/JavaScript/jsc/WebKit/WebKitBuild/Release/JavaScriptCore/PrivateHeaders/JavaScriptCore \; diff --git a/build-id b/build-id index f599e28b8ab0d8..48082f72f087ce 100644 --- a/build-id +++ b/build-id @@ -1 +1 @@ -10 +12 diff --git a/packages/bun-cli-darwin-x64/package.json b/packages/bun-cli-darwin-x64/package.json index af0b3d066dc8ae..6dbd54c0d67c9d 100644 --- a/packages/bun-cli-darwin-x64/package.json +++ b/packages/bun-cli-darwin-x64/package.json @@ -4,5 +4,5 @@ }, "name": "bun-cli-darwin-x64", "repository": "https://github.com/jarred-sumner/bun", - "version": "0.0.0-10" + "version": "0.0.0-12" } diff --git a/packages/bun-cli/package.json b/packages/bun-cli/package.json index b40d2add47a17d..7029f2b992accb 100644 --- a/packages/bun-cli/package.json +++ b/packages/bun-cli/package.json @@ -9,5 +9,5 @@ "postinstall": "node postinstall.js", "prepublishOnly": "rm -rf ./bin/bun; chmod +x ./reset-bin.js; cp ./reset-bin.js ./bin/bun" }, - "version": "0.0.0-10" + "version": "0.0.0-12" } diff --git a/packages/bun-cli/scripts/postinstall.ts b/packages/bun-cli/scripts/postinstall.ts index 3ebe0300b86c74..e0f6adf542d2ce 100644 --- a/packages/bun-cli/scripts/postinstall.ts +++ b/packages/bun-cli/scripts/postinstall.ts @@ -334,7 +334,7 @@ const knownWindowsPackages: Record = { }; const knownUnixlikePackages: Record = { // "android arm64 LE": "bun-cli-android-arm64", - // "darwin arm64 LE": "bun-cli-darwin-arm64", + "darwin arm64 LE": "bun-cli-darwin-aarch64", "darwin x64 LE": "bun-cli-darwin-x64", // "freebsd arm64 LE": "bun-cli-freebsd-arm64", // "freebsd x64 LE": "bun-cli-freebsd-64",