should be it…

Author: juleswritescode

.github/workflows/publish.reusable.yml

@@ -34,25 +34,20 @@ jobs:
           RELEASE_TAG: ${{ inputs.release-tag }}
           PRERELEASE: ${{ inputs.is-prerelease }}
 
-      - name: LS those packages
+      - name: Publish npm packages as nightly
+        if: inputs.is-prerelease == 'true'
         run: |
-          ls packages/@postgrestools
-          cat packages/@postgrestools/postgrestools/package.json
-
-      # - name: Publish npm packages as nightly
-      #   if: inputs.is-prerelease == 'true'
-      #   run: |
-      #     for package in packages/@postgrestools/*; do
-      #       npm publish "$package" --tag nightly --access public --provenance
-      #     done
-      #   env:
-      #     NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} #
+          for package in packages/@postgrestools/*; do
+            npm publish "$package" --tag nightly --access public --provenance
+          done
+        env:
+          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} #
 
-      # - name: Publish npm packages as latest
-      #   if: inputs.is-prerelease != 'true'
-      #   run: |
-      #     for package in packages/@postgrestools/*; do
-      #       npm publish "$package" --tag latest --access public --provenance
-      #     done
-      #   env:
-      #     NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
+      - name: Publish npm packages as latest
+        if: inputs.is-prerelease != 'true'
+        run: |
+          for package in packages/@postgrestools/*; do
+            npm publish "$package" --tag latest --access public --provenance
+          done
+        env:
+          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}

.github/workflows/release.yml

@@ -9,7 +9,7 @@ permissions:
 env:
   # Need these guys for cross-compilation
   CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER: aarch64-linux-gnu-gcc
-  # CARGO_TARGET_AARCH64_UNKNOWN_LINUX_MUSL_LINKER: aarch64-linux-gnu-gcc
+  CARGO_TARGET_AARCH64_UNKNOWN_LINUX_MUSL_LINKER: aarch64-linux-gnu-gcc
 
 jobs:
   # windows does not run git cliff so we need to do it here
@@ -38,14 +38,9 @@ jobs:
           - { os: ubuntu-22.04, target: aarch64-unknown-linux-gnu }
           - { os: macos-14, target: x86_64-apple-darwin }
           - { os: macos-14, target: aarch64-apple-darwin }
-          # - { os: windows-2022, target: x86_64-pc-windows-msvc }
-          # - { os: windows-2022, target: aarch64-pc-windows-msvc }
+          - { os: windows-2022, target: x86_64-pc-windows-msvc }
+          - { os: windows-2022, target: aarch64-pc-windows-msvc }
           - { os: ubuntu-22.04, target: x86_64-unknown-linux-musl }
-          - {
-              os: ubuntu-22.04,
-              target: aarch64-unknown-linux-musl,
-              container: "messense/rust-musl-cross:aarch64-musl",
-            }
 
     runs-on: ${{ matrix.config.os }}
     container: ${{ matrix.config.container }}
@@ -58,27 +53,13 @@ jobs:
         with:
           submodules: true
 
-      - name: DEBUG Rust Container
-        if: matrix.config.container != null
-        run: |
-          which rustc
-          rustc --version
-          rustup show
-          rustup target list --installed
-
       - uses: actions-rust-lang/setup-rust-toolchain@v1
-        if: matrix.config.container == null
         with:
           target: ${{ matrix.config.target }}
 
       - uses: Swatinem/rust-cache@v2
-        if: matrix.config.container == null
         id: rust-cache
 
-      - name: Add Rust target in container
-        if: matrix.config.container != null
-        run: rustup target add ${{ matrix.config.target }}
-
       # The Aarch64 Linux is a special snowflake, we need to install its toolchain
       - name: Install arm64 toolchain
         if: matrix.config.target == 'aarch64-unknown-linux-gnu'
@@ -93,13 +74,12 @@ jobs:
           sudo apt-get install -y musl-tools
 
       - name: Setup Postgres
-        if: matrix.config.container == null
         uses: ./.github/actions/setup-postgres
 
-      # - name: 🧪 Run Tests
-      #   run: cargo test --release
-      #   env:
-      #     DATABASE_URL: postgres://postgres:postgres@localhost:5432/postgres
+      - name: 🧪 Run Tests
+        run: cargo test --release
+        env:
+          DATABASE_URL: postgres://postgres:postgres@localhost:5432/postgres
 
       - name: 🛠️ Run Build
         run: cargo build -p pgt_cli --release --target ${{ matrix.config.target }}
@@ -108,7 +88,6 @@ jobs:
           RUSTFLAGS: "-C strip=symbols -C codegen-units=1"
           # Inline the version in the CLI binary
           PGT_VERSION: ${{ needs.extract_version.outputs.version }}
-          SQLX_OFFLINE: ${{ matrix.config.container != null }}
 
       # windows is a special snowflake too, it saves binaries as .exe
       - name: 👦 Name the Binary

packages/@postgrestools/postgrestools/scripts/generate-packages.mjs

@@ -9,14 +9,34 @@ const streamPipeline = promisify(pipeline);
 const CLI_ROOT = resolve(fileURLToPath(import.meta.url), "../..");
 const PACKAGES_POSTGRESTOOLS_ROOT = resolve(CLI_ROOT, "..");
 const POSTGRESTOOLS_ROOT = resolve(PACKAGES_POSTGRESTOOLS_ROOT, "../..");
-const SUPPORTED_PLATFORMS = [
-  // "pc-windows-msvc",
-  "apple-darwin",
-  "unknown-linux-gnu",
-  "unknown-linux-musl",
-];
 const MANIFEST_PATH = resolve(CLI_ROOT, "package.json");
-const SUPPORTED_ARCHITECTURES = ["x86_64", "aarch64"];
+
+function platformArchCombinations() {
+  const SUPPORTED_PLATFORMS = [
+    "pc-windows-msvc",
+    "apple-darwin",
+    "unknown-linux-gnu",
+    "unknown-linux-musl",
+  ];
+
+  const SUPPORTED_ARCHITECTURES = ["x86_64", "aarch64"];
+
+  return SUPPORTED_PLATFORMS.flatMap((platform) => {
+    return SUPPORTED_ARCHITECTURES.flatMap((arch) => {
+      // we do not support MUSL builds on aarch64, as this would
+      // require difficult cross compilation and most aarch64 users should
+      // have sufficiently modern glibc versions
+      if (platform.endsWith("musl") && arch === "aarch64") {
+        return [];
+      }
+
+      return {
+        platform,
+        arch,
+      };
+    });
+  });
+}
 
 async function downloadSchema(releaseTag, githubToken) {
   const assetUrl = `https://github.com/supabase-community/postgres-language-server/releases/download/${releaseTag}/schema.json`;
@@ -80,11 +100,8 @@ async function writeManifest(packagePath, version) {
     fs.readFileSync(manifestPath).toString("utf-8")
   );
 
-  const nativePackages = SUPPORTED_PLATFORMS.flatMap((platform) =>
-    SUPPORTED_ARCHITECTURES.map((arch) => [
-      getPackageName(platform, arch),
-      version,
-    ])
+  const nativePackages = platformArchCombinations().map(
+    ({ platform, arch }) => [getPackageName(platform, arch), version]
   );
 
   manifestData.version = version;
@@ -243,15 +260,12 @@ function getVersion(releaseTag, isPrerelease) {
   await writeManifest("postgrestools", version);
   await writeManifest("backend-jsonrpc", version);
 
-  for (const platform of SUPPORTED_PLATFORMS) {
+  for (const { platform, arch } of platformArchCombinations()) {
     const os = getOs(platform);
-
-    for (const arch of SUPPORTED_ARCHITECTURES) {
-      await makePackageDir(platform, arch);
-      await downloadBinary(platform, arch, os, releaseTag, githubToken);
-      copyBinaryToNativePackage(platform, arch, os);
-      copySchemaToNativePackage(platform, arch);
-    }
+    await makePackageDir(platform, arch);
+    await downloadBinary(platform, arch, os, releaseTag, githubToken);
+    copyBinaryToNativePackage(platform, arch, os);
+    copySchemaToNativePackage(platform, arch);
   }
 
   process.exit(0);