v0.6.0

Author: nitsky

crates/build/build_pkgs.rs

@@ -25,7 +25,7 @@ pub fn run(args: Args) {
 	let alpine_public_key = cmd!("pass", "tangram/keys/alpine.public.rsa")
 		.read()
 		.unwrap();
-	let alpine_private_key = cmd!("pass", "tangram/keys/alpine.public.rsa")
+	let alpine_private_key = cmd!("pass", "tangram/keys/alpine.private.rsa")
 		.read()
 		.unwrap();
 	let deb_public_key = cmd!("pass", "tangram/keys/deb.public.gpg").read().unwrap();
@@ -89,7 +89,7 @@ fn alpine(
 	alpine_public_key_path: &Path,
 	alpine_private_key_path: &Path,
 ) -> Result<()> {
-	for arch in [Arch::X8664, Arch::AArch64] {
+	for target in [Target::X8664UnknownLinuxMusl] {
 		let repo_path = pkgs_path.join("stable").join("alpine");
 		std::fs::create_dir_all(&repo_path).unwrap();
 		std::fs::copy(alpine_public_key_path, repo_path.join("tangram.rsa")).unwrap();
@@ -106,39 +106,36 @@ fn alpine(
 				arch={arch}
 				license="MIT"
 				source="tangram"
-				\n
+				options="!strip"
+
 				check() {{
 					:
 				}}
-				\n
+
 				package() {{
 					install -D -m 755 "$srcdir"/tangram "$pkgdir"/usr/bin/tangram
 				}}
 			"#,
 			version = args.version,
-			arch = match arch {
+			arch = match target.arch() {
 				Arch::X8664 => "x86_64",
 				Arch::AArch64 => "aarch64",
 				Arch::Wasm32 => unreachable!(),
 			},
 		);
 		std::fs::write(&apkbuild_path, &apkbuild).unwrap();
 		let tangram_cli_dst_path = repo_path.join("tangram");
-		let target = match arch {
-			Arch::X8664 => Target::X8664UnknownLinuxGnu,
-			Arch::AArch64 => Target::AArch64UnknownLinuxGnu,
-			Arch::Wasm32 => unreachable!(),
-		};
 		let tangram_cli_path = dist_path
 			.join(target.as_str())
 			.join(TargetFileNames::for_target(target).tangram_cli_file_name);
 		std::fs::copy(tangram_cli_path, &tangram_cli_dst_path).unwrap();
 		let script = r#"
+			set -e
 			apk add build-base abuild
-			echo "PACKAGER_PUBKEY=/tangram.public.rsa" >> /etc/abuild.conf
-			echo "PACKAGER_PRIVKEY=/tangram.private.rsa" >> /etc/abuild.conf
+			echo "PACKAGER_PUBKEY=/alpine.public.rsa" >> /etc/abuild.conf
+			echo "PACKAGER_PRIVKEY=/alpine.private.rsa" >> /etc/abuild.conf
 			abuild -F checksum
-			abuild -F -P $PWD
+			abuild -f -F -P $PWD
 			rm -rf src pkg
 		"#;
 		cmd!(
@@ -156,13 +153,13 @@ fn alpine(
 			format!(
 				"{}:{}",
 				alpine_public_key_path.canonicalize().unwrap().display(),
-				"/tangram.public.rsa"
+				"/alpine.public.rsa"
 			),
 			"-v",
 			format!(
 				"{}:{}",
 				alpine_private_key_path.canonicalize().unwrap().display(),
-				"/tangram.private.rsa"
+				"/alpine.private.rsa"
 			),
 			"-w",
 			"/tangram",

crates/build/compile.rs

@@ -465,18 +465,15 @@ fn build_python_windows(target: Target) {
 
 fn build_wasm(target: Target) {
 	cmd!(
-		which("cargo").unwrap(),
+		"cargo",
 		"build",
 		"--release",
 		"--target",
 		target.as_str(),
 		"--package",
 		"tangram_wasm",
 	)
-	.env(
-		"CARGO_TARGET_DIR",
-		format!("../../target_{}", target.as_str()),
-	)
+	.env("CARGO_TARGET_DIR", format!("target_{}", target.as_str()))
 	.run()
 	.unwrap();
 }

crates/build/prepare_release.rs

@@ -103,6 +103,8 @@ pub fn run(args: Args) {
 		// Write the spec file.
 		let spec = formatdoc!(
 			r#"
+				%global __os_install_post %{{nil}}
+
 				Name: tangram
 				Version: {}
 				Release: 1

flake.nix

@@ -40,7 +40,7 @@
           clang_12
           lld_12
         ];
-        cargoSha256 = "sha256-M6d0Lc+0NHqskmwM2NTFyOfHkvDfNYyniwM34T0aACI=";
+        cargoSha256 = "sha256-Gl0iYChLgvG7f3TAuPFClRmLYSjtDq7wHHDCqr8adTQ=";
         cargoBuildFlags = [ "--bin" "tangram" ];
         CARGO_TARGET_WASM32_UNKNOWN_UNKNOWN_LINKER = "lld";
       };

languages/elixir/scripts/release

@@ -3,7 +3,7 @@ install -D ../../dist/x86_64-unknown-linux-gnu/libtangram_elixir.so priv/x86_64-
 install -D ../../dist/aarch64-unknown-linux-gnu/libtangram_elixir.so priv/aarch64-unknown-linux-gnu/libtangram_elixir.so
 install -D ../../dist/x86_64-unknown-linux-musl/libtangram_elixir.so priv/x86_64-unknown-linux-musl/libtangram_elixir.so
 install -D ../../dist/aarch64-unknown-linux-musl/libtangram_elixir.so priv/aarch64-unknown-linux-musl/libtangram_elixir.so
-install -D ../../dist/x86_64-apple-darwin/libtangram_elixir.dylib priv/x86_64-apple-darwin/libtangram_elixir.dylib
-install -D ../../dist/aarch64-apple-darwin/libtangram_elixir.dylib priv/aarch64-apple-darwin/libtangram_elixir.dylib
+install -D ../../dist/x86_64-apple-darwin/libtangram_elixir.dylib priv/x86_64-apple-darwin/libtangram_elixir.so
+install -D ../../dist/aarch64-apple-darwin/libtangram_elixir.dylib priv/aarch64-apple-darwin/libtangram_elixir.so
 install -D ../../dist/x86_64-pc-windows-msvc/tangram_elixir.dll priv/x86_64-pc-windows-msvc/tangram_elixir.dll
 mix hex.publish

languages/javascript/scripts/release

@@ -47,7 +47,7 @@ wasm-bindgen --target deno --out-dir dist/deno/ $wasm
 cp entrypoints/deno.ts dist/deno/mod.ts
 
 # publish npm package
-# npm publish --access public
+npm publish --access public
 
 # publish js.tangram.xyz
 ssh [email protected] mkdir -p /srv/js/

languages/ruby/scripts/release

@@ -1,11 +1,11 @@
 rm -rf lib/tangram/libtangram/
-install -D ../../x86_64-unknown-linux-gnu/libtangram.so lib/tangram/libtangram/x86_64-unknown-linux-gnu/libtangram.so
-install -D ../../aarch64-unknown-linux-gnu/libtangram.so lib/tangram/libtangram/aarch64-unknown-linux-gnu/libtangram.so
-install -D ../../x86_64-unknown-linux-musl/libtangram.so lib/tangram/libtangram/x86_64-unknown-linux-musl/libtangram.so
-install -D ../../aarch64-unknown-linux-musl/libtangram.so lib/tangram/libtangram/aarch64-unknown-linux-musl/libtangram.so
-install -D ../../x86_64-apple-darwin/libtangram.dylib lib/tangram/libtangram/x86_64-apple-darwin/libtangram.dylib
-install -D ../../aarch64-apple-darwin/libtangram.dylib lib/tangram/libtangram/aarch64-apple-darwin/libtangram.dylib
-install -D ../../x86_64-pc-windows-msvc/tangram.dll lib/tangram/libtangram/x86_64-pc-windows-msvc/tangram.dll
+install -D ../../dist/x86_64-unknown-linux-gnu/libtangram.so lib/tangram/libtangram/x86_64-unknown-linux-gnu/libtangram.so
+install -D ../../dist/aarch64-unknown-linux-gnu/libtangram.so lib/tangram/libtangram/aarch64-unknown-linux-gnu/libtangram.so
+install -D ../../dist/x86_64-unknown-linux-musl/libtangram.so lib/tangram/libtangram/x86_64-unknown-linux-musl/libtangram.so
+install -D ../../dist/aarch64-unknown-linux-musl/libtangram.so lib/tangram/libtangram/aarch64-unknown-linux-musl/libtangram.so
+install -D ../../dist/x86_64-apple-darwin/libtangram.dylib lib/tangram/libtangram/x86_64-apple-darwin/libtangram.dylib
+install -D ../../dist/aarch64-apple-darwin/libtangram.dylib lib/tangram/libtangram/aarch64-apple-darwin/libtangram.dylib
+install -D ../../dist/x86_64-pc-windows-msvc/tangram.dll lib/tangram/libtangram/x86_64-pc-windows-msvc/tangram.dll
 gem build tangram.gemspec
 rm -rf dist
 mkdir -p dist

languages/rust/scripts/release

@@ -1,3 +1,3 @@
 set -e
-pushd macro && cargo publish && popd
+cargo publish --manifest-path macro/Cargo.toml
 cargo publish

scripts/release

@@ -1,8 +1,6 @@
 set -e
 for path in id zip progress_counter kill_chip finite table metrics text features model linear tree core
 do
-  pushd crates/$path
-  cargo publish
-  popd
+  cargo publish --manifest-path crates/$path/Cargo.toml
   sleep 15
 done