fix(ci): get binaries uploading

Author: MasterPtato

.github/workflows/release.yaml

@@ -55,17 +55,17 @@ jobs:
   #         git config --global user.name "github-actions[bot]"
   #         git config --global user.email "github-actions[bot]@users.noreply.github.com"
 
-  #         # Install Deno
-  #         curl -fsSL https://deno.land/x/install/install.sh | sh
-  #         export PATH=$HOME/.deno/bin:$PATH
-
   #         # Authenticate with NPM
   #         cat << EOF > ~/.npmrc
   #         //registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}
   #         EOF
 
+  #         # Install dependencies
   #         pnpm install
 
+  #         # Install tsx globally
+  #         npm install -g tsx
+
   #         if [ "${{ inputs.latest }}" = "true" ]; then
   #             ./scripts/release/main.ts --version "${{ github.event.inputs.version }}" --setupCi
   #         else
@@ -224,6 +224,12 @@ jobs:
   #       with:
   #         lfs: 'true'
 
+  #     - uses: actions/setup-node@v4
+  #       with:
+  #         node-version: 20
+
+  #     - run: corepack enable
+
   #     - uses: ./.github/actions/docker-setup
   #       with:
   #         docker_username: ${{ secrets.DOCKER_CI_USERNAME }}
@@ -235,12 +241,14 @@ jobs:
   #         R2_RELEASES_ACCESS_KEY_ID: ${{ secrets.R2_RELEASES_ACCESS_KEY_ID }}
   #         R2_RELEASES_SECRET_ACCESS_KEY: ${{ secrets.R2_RELEASES_SECRET_ACCESS_KEY }}
   #       run: |
-  #         # Install Deno
-  #         curl -fsSL https://deno.land/x/install/install.sh | sh
-  #         export PATH=$HOME/.deno/bin:$PATH
+  #         # Install dependencies
+  #         pnpm install
+
+  #         # Install tsx globally
+  #         npm install -g tsx
 
   #         if [ "${{ inputs.latest }}" = "true" ]; then
   #             ./scripts/release/main.ts --version "${{ github.event.inputs.version }}" --completeCi
   #         else
   #             ./scripts/release/main.ts --version "${{ github.event.inputs.version }}" --no-latest --completeCi
-  #         fi
+  #         fi

pnpm-lock.yaml

@@ -2,6 +2,7 @@ packages:
   - docker/template
   - frontend
   - scripts/tests
+  - scripts/release
   - sdks/typescript/api-full
   - sdks/typescript/api-runtime
   - sdks/typescript/runner

pnpm-workspace.yaml

@@ -1,98 +1,93 @@
 import type { ReleaseOpts } from "./main.ts";
-import { assertExists } from "@std/assert/exists";
-import $, { CommandBuilder } from "dax";
-import { assert } from "@std/assert/assert";
-import { resolve } from "@std/path";
+import { $ } from "execa";
+import * as path from "node:path";
+import * as fs from "node:fs/promises";
+
+function assert(condition: any, message?: string): asserts condition {
+	if (!condition) {
+		throw new Error(message || "Assertion failed");
+	}
+}
 
 export async function updateArtifacts(opts: ReleaseOpts) {
 	// Get credentials and set them in the environment
-	const awsAccessKeyId =
-		Deno.env.get("R2_RELEASES_ACCESS_KEY_ID") ??
-		(await $`op read "op://Engineering/rivet-releases R2 Upload/username"`.text());
-	const awsSecretAccessKey =
-		Deno.env.get("R2_RELEASES_SECRET_ACCESS_KEY") ??
-		(await $`op read "op://Engineering/rivet-releases R2 Upload/password"`.text());
+	let awsAccessKeyId = process.env.R2_RELEASES_ACCESS_KEY_ID;
+	if (!awsAccessKeyId) {
+		const result = await $`op read "op://Engineering/rivet-releases R2 Upload/username"`;
+		awsAccessKeyId = result.stdout.trim();
+	}
+	let awsSecretAccessKey = process.env.R2_RELEASES_SECRET_ACCESS_KEY;
+	if (!awsSecretAccessKey) {
+		const result = await $`op read "op://Engineering/rivet-releases R2 Upload/password"`;
+		awsSecretAccessKey = result.stdout.trim();
+	}
 
 	const endpointUrl = "https://2a94c6a0ced8d35ea63cddc86c2681e7.r2.cloudflarestorage.com";
 
-	// Create AWS CLI command builder with credentials
-	const awsCommand = new CommandBuilder().env({
+	// Create AWS environment for commands
+	const awsEnv = {
 		AWS_ACCESS_KEY_ID: awsAccessKeyId,
 		AWS_SECRET_ACCESS_KEY: awsSecretAccessKey,
 		AWS_DEFAULT_REGION: "auto",
-	});
+	};
 
 	// List all files under rivet/{commit}/
 	const commitPrefix = `rivet/${opts.commit}/`;
-	$.logStep("Listing Original Files", commitPrefix);
-	const commitFiles = await awsCommand
-		.command(
-			`aws s3api list-objects --bucket rivet-releases --prefix ${commitPrefix} --endpoint-url ${endpointUrl}`,
-		)
-		.json();
+	console.log(`==> Listing Original Files: ${commitPrefix}`);
+	const listResult = await $({ env: awsEnv, shell: true })`aws s3api list-objects --bucket rivet-releases --prefix ${commitPrefix} --endpoint-url ${endpointUrl}`;
+	const commitFiles = JSON.parse(listResult.stdout);
 	assert(
 		Array.isArray(commitFiles?.Contents) && commitFiles.Contents.length > 0,
 		`No files found under rivet/${opts.commit}/`,
 	);
 
 	// Copy files to version directory
 	const versionTarget = `rivet/${opts.version}/`;
-	await copyFiles(awsCommand, commitPrefix, versionTarget, endpointUrl);
-	await generateInstallScripts(awsCommand, opts, opts.version, endpointUrl);
+	await copyFiles(awsEnv, commitPrefix, versionTarget, endpointUrl);
+	await generateInstallScripts(awsEnv, opts, opts.version, endpointUrl);
 
 	// If this is the latest version, copy to latest directory
 	if (opts.latest) {
-		await copyFiles(awsCommand, commitPrefix, "rivet/latest/", endpointUrl);
-		await generateInstallScripts(awsCommand, opts, "latest", endpointUrl);
+		await copyFiles(awsEnv, commitPrefix, "rivet/latest/", endpointUrl);
+		await generateInstallScripts(awsEnv, opts, "latest", endpointUrl);
 	}
 }
 
 async function copyFiles(
-	awsCommand: CommandBuilder,
+	awsEnv: Record<string, string>,
 	sourcePrefix: string,
 	targetPrefix: string,
 	endpointUrl: string,
 ) {
-	$.logStep("Copying Files", targetPrefix);
-	await $.logGroup(async () => {
-		// Delete existing files in target directory using --recursive
-		$.logStep("Deleting existing files in", targetPrefix);
-		await awsCommand
-			.command(`aws s3 rm s3://rivet-releases/${targetPrefix} --recursive --endpoint-url ${endpointUrl}`)
-			.spawn();
+	console.log(`==> Copying Files: ${targetPrefix}`);
+	// Delete existing files in target directory using --recursive
+	console.log(`Deleting existing files in ${targetPrefix}`);
+	await $({ env: awsEnv, shell: true })`aws s3 rm s3://rivet-releases/${targetPrefix} --recursive --endpoint-url ${endpointUrl}`;
 
-		// Copy new files using --recursive
-		$.logStep("Copying files from", sourcePrefix, "to", targetPrefix);
-		await awsCommand
-			.command(
-				`aws s3 cp s3://rivet-releases/${sourcePrefix} s3://rivet-releases/${targetPrefix} --recursive --copy-props none --endpoint-url ${endpointUrl}`,
-			)
-			.spawn();
-	});
+	// Copy new files using --recursive
+	console.log(`Copying files from ${sourcePrefix} to ${targetPrefix}`);
+	await $({ env: awsEnv, shell: true })`aws s3 cp s3://rivet-releases/${sourcePrefix} s3://rivet-releases/${targetPrefix} --recursive --copy-props none --endpoint-url ${endpointUrl}`;
 }
 
 async function generateInstallScripts(
-	awsCommand: CommandBuilder,
+	awsEnv: Record<string, string>,
 	opts: ReleaseOpts,
 	version: string,
 	endpointUrl: string,
 ) {
 	const installScriptPaths = [
-		resolve(opts.root, "scripts/release/static/install.sh"),
-		resolve(opts.root, "scripts/release/static/install.ps1"),
+		path.resolve(opts.root, "scripts/release/static/install.sh"),
+		path.resolve(opts.root, "scripts/release/static/install.ps1"),
 	];
 
 	for (const scriptPath of installScriptPaths) {
-		let scriptContent = await Deno.readTextFile(scriptPath);
+		let scriptContent = await fs.readFile(scriptPath, 'utf-8');
 		scriptContent = scriptContent.replace(/__VERSION__/g, version);
 
 		const uploadKey = `rivet/${version}/${scriptPath.split("/").pop() ?? ""}`;
 
 		// Upload the install script to S3
-		$.logStep("Uploading Install Script", uploadKey);
-		await awsCommand
-			.command(`aws s3 cp - s3://rivet-releases/${uploadKey} --endpoint-url ${endpointUrl}`)
-			.stdinText(scriptContent)
-			.spawn();
+		console.log(`==> Uploading Install Script: ${uploadKey}`);
+		await $({ env: awsEnv, input: scriptContent, shell: true })`aws s3 cp - s3://rivet-releases/${uploadKey} --endpoint-url ${endpointUrl}`;
 	}
 }

scripts/release/artifacts.ts

@@ -1,4 +1,4 @@
-import $ from "dax";
+import { $ } from "execa";
 
 const REPOS = [
 	{ name: "rivetgg/rivet-server", prefix: "slim", main: true },
@@ -11,9 +11,10 @@ const REPOS = [
 export async function tagDocker(opts: { version: string; commit: string; latest: boolean }) {
 	for (const { name, prefix, main } of REPOS) {
 		// Check image exists
-		$.logStep("Pulling", `${name}:${prefix}-${opts.commit}`);
-		const imageExists = await $`docker pull --platform amd64 ${name}:${prefix}-${opts.commit}`.quiet().noThrow();
-		if (imageExists.code !== 0) {
+		console.log(`==> Pulling: ${name}:${prefix}-${opts.commit}`);
+		try {
+			await $({ stdout: 'ignore', stderr: 'ignore' })`docker pull --platform amd64 ${name}:${prefix}-${opts.commit}`;
+		} catch (error) {
 			throw new Error(`Image ${name}:${prefix}-${opts.commit} does not exist on Docker Hub.`);
 		}
 
@@ -34,7 +35,7 @@ export async function tagDocker(opts: { version: string; commit: string; latest:
 }
 
 async function tag(image: string, from: string, to: string) {
-	$.logStep("Tagging", `${image}:${from} -> ${image}:${to}`);
+	console.log(`==> Tagging: ${image}:${from} -> ${image}:${to}`);
 	await $`docker tag ${image}:${from} ${image}:${to}`;
 	await $`docker push ${image}:${to}`;
 }

scripts/release/docker.ts

@@ -1,9 +1,10 @@
 import type { ReleaseOpts } from "./main.ts";
-import $ from "dax";
+import { $ } from "execa";
 
 export async function validateGit(_opts: ReleaseOpts) {
 	// Validate there's no uncommitted changes
-	const status = await $`git status --porcelain`.text();
+	const result = await $`git status --porcelain`;
+	const status = result.stdout;
 	if (status.trim().length > 0) {
 		throw new Error(
 			"There are uncommitted changes. Please commit or stash them.",