feat(build): x86 musl build

.github/workflows/release.yml

@@ -43,6 +43,7 @@ jobs:
           - { 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: ubuntu-22.04, target: x86_64-unknown-linux-musl }
 
     runs-on: ${{ matrix.config.os }}
 
@@ -53,6 +54,7 @@ jobs:
       - uses: actions/checkout@v4
         with:
           submodules: true
+
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
           target: ${{ matrix.config.target }}
@@ -67,6 +69,12 @@ jobs:
           sudo apt-get update
           sudo apt-get install -y gcc-aarch64-linux-gnu
 
+      - name: Install musl toolchain
+        if: matrix.config.target == 'x86_64-unknown-linux-musl'
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y musl-tools
+
       - name: Setup Postgres
         uses: ./.github/actions/setup-postgres
 
@@ -130,7 +138,9 @@ jobs:
 
       - name: Ensure tag matches
         if: steps.create_changelog.outputs.version != needs.extract_version.outputs.version
-        run: exit 1
+        run: |
+          echo "Tag does not match: ${{ steps.create_changelog.outputs.version }} vs ${{ needs.extract_version.outputs.version }}"
+          exit 1
 
       - name: 👇 Download Artifacts
         uses: actions/download-artifact@v4

bun.lock

@@ -5,11 +5,11 @@
       "name": "postgres_lsp",
       "devDependencies": {
         "@biomejs/biome": "1.9.4",
-        "@types/bun": "latest"
+        "@types/bun": "latest",
       },
       "peerDependencies": {
-        "typescript": "^5"
-      }
+        "typescript": "^5",
+      },
     },
     "packages/@postgrestools/backend-jsonrpc": {
       "name": "@postgrestools/backend-jsonrpc",
@@ -19,148 +19,70 @@
         "@postgrestools/cli-linux-arm64": "<placeholder>",
         "@postgrestools/cli-linux-x64": "<placeholder>",
         "@postgrestools/cli-win32-arm64": "<placeholder>",
-        "@postgrestools/cli-win32-x64": "<placeholder>"
-      }
+        "@postgrestools/cli-win32-x64": "<placeholder>",
+      },
     },
     "packages/@postgrestools/postgrestools": {
       "name": "@postgrestools/postgrestools",
       "bin": {
-        "postgrestools": "bin/postgrestools"
+        "postgrestools": "bin/postgrestools",
       },
       "optionalDependencies": {
         "@postgrestools/cli-aarch64-apple-darwin": "<placeholder>",
         "@postgrestools/cli-aarch64-linux-gnu": "<placeholder>",
         "@postgrestools/cli-aarch64-windows-msvc": "<placeholder>",
         "@postgrestools/cli-x86_64-apple-darwin": "<placeholder>",
         "@postgrestools/cli-x86_64-linux-gnu": "<placeholder>",
-        "@postgrestools/cli-x86_64-windows-msvc": "<placeholder>"
-      }
-    }
+        "@postgrestools/cli-x86_64-linux-musl": "<placeholder>",
+        "@postgrestools/cli-x86_64-windows-msvc": "<placeholder>",
+      },
+    },
   },
   "packages": {
-    "@biomejs/biome": [
-      "@biomejs/biome@1.9.4",
-      "",
-      {
-        "optionalDependencies": {
-          "@biomejs/cli-darwin-arm64": "1.9.4",
-          "@biomejs/cli-darwin-x64": "1.9.4",
-          "@biomejs/cli-linux-arm64": "1.9.4",
-          "@biomejs/cli-linux-arm64-musl": "1.9.4",
-          "@biomejs/cli-linux-x64": "1.9.4",
-          "@biomejs/cli-linux-x64-musl": "1.9.4",
-          "@biomejs/cli-win32-arm64": "1.9.4",
-          "@biomejs/cli-win32-x64": "1.9.4"
-        },
-        "bin": { "biome": "bin/biome" }
-      },
-      "sha512-1rkd7G70+o9KkTn5KLmDYXihGoTaIGO9PIIN2ZB7UJxFrWw04CZHPYiMRjYsaDvVV7hP1dYNRLxSANLaBFGpog=="
-    ],
-
-    "@biomejs/cli-darwin-arm64": [
-      "@biomejs/cli-darwin-arm64@1.9.4",
-      "",
-      { "os": "darwin", "cpu": "arm64" },
-      "sha512-bFBsPWrNvkdKrNCYeAp+xo2HecOGPAy9WyNyB/jKnnedgzl4W4Hb9ZMzYNbf8dMCGmUdSavlYHiR01QaYR58cw=="
-    ],
-
-    "@biomejs/cli-darwin-x64": [
-      "@biomejs/cli-darwin-x64@1.9.4",
-      "",
-      { "os": "darwin", "cpu": "x64" },
-      "sha512-ngYBh/+bEedqkSevPVhLP4QfVPCpb+4BBe2p7Xs32dBgs7rh9nY2AIYUL6BgLw1JVXV8GlpKmb/hNiuIxfPfZg=="
-    ],
-
-    "@biomejs/cli-linux-arm64": [
-      "@biomejs/cli-linux-arm64@1.9.4",
-      "",
-      { "os": "linux", "cpu": "arm64" },
-      "sha512-fJIW0+LYujdjUgJJuwesP4EjIBl/N/TcOX3IvIHJQNsAqvV2CHIogsmA94BPG6jZATS4Hi+xv4SkBBQSt1N4/g=="
-    ],
-
-    "@biomejs/cli-linux-arm64-musl": [
-      "@biomejs/cli-linux-arm64-musl@1.9.4",
-      "",
-      { "os": "linux", "cpu": "arm64" },
-      "sha512-v665Ct9WCRjGa8+kTr0CzApU0+XXtRgwmzIf1SeKSGAv+2scAlW6JR5PMFo6FzqqZ64Po79cKODKf3/AAmECqA=="
-    ],
-
-    "@biomejs/cli-linux-x64": [
-      "@biomejs/cli-linux-x64@1.9.4",
-      "",
-      { "os": "linux", "cpu": "x64" },
-      "sha512-lRCJv/Vi3Vlwmbd6K+oQ0KhLHMAysN8lXoCI7XeHlxaajk06u7G+UsFSO01NAs5iYuWKmVZjmiOzJ0OJmGsMwg=="
-    ],
-
-    "@biomejs/cli-linux-x64-musl": [
-      "@biomejs/cli-linux-x64-musl@1.9.4",
-      "",
-      { "os": "linux", "cpu": "x64" },
-      "sha512-gEhi/jSBhZ2m6wjV530Yy8+fNqG8PAinM3oV7CyO+6c3CEh16Eizm21uHVsyVBEB6RIM8JHIl6AGYCv6Q6Q9Tg=="
-    ],
-
-    "@biomejs/cli-win32-arm64": [
-      "@biomejs/cli-win32-arm64@1.9.4",
-      "",
-      { "os": "win32", "cpu": "arm64" },
-      "sha512-tlbhLk+WXZmgwoIKwHIHEBZUwxml7bRJgk0X2sPyNR3S93cdRq6XulAZRQJ17FYGGzWne0fgrXBKpl7l4M87Hg=="
-    ],
-
-    "@biomejs/cli-win32-x64": [
-      "@biomejs/cli-win32-x64@1.9.4",
-      "",
-      { "os": "win32", "cpu": "x64" },
-      "sha512-8Y5wMhVIPaWe6jw2H+KlEm4wP/f7EW3810ZLmDlrEEy5KvBsb9ECEfu/kMWD484ijfQ8+nIi0giMgu9g1UAuuA=="
-    ],
-
-    "@postgrestools/backend-jsonrpc": [
-      "@postgrestools/backend-jsonrpc@workspace:packages/@postgrestools/backend-jsonrpc"
-    ],
-
-    "@postgrestools/postgrestools": [
-      "@postgrestools/postgrestools@workspace:packages/@postgrestools/postgrestools"
-    ],
-
-    "@types/bun": [
-      "@types/bun@1.2.5",
-      "",
-      { "dependencies": { "bun-types": "1.2.5" } },
-      "sha512-w2OZTzrZTVtbnJew1pdFmgV99H0/L+Pvw+z1P67HaR18MHOzYnTYOi6qzErhK8HyT+DB782ADVPPE92Xu2/Opg=="
-    ],
-
-    "@types/node": [
-      "@types/node@22.13.10",
-      "",
-      { "dependencies": { "undici-types": "~6.20.0" } },
-      "sha512-I6LPUvlRH+O6VRUqYOcMudhaIdUVWfsjnZavnsraHvpBwaEyMN29ry+0UVJhImYL16xsscu0aske3yA+uPOWfw=="
-    ],
-
-    "@types/ws": [
-      "@types/ws@8.5.14",
-      "",
-      { "dependencies": { "@types/node": "*" } },
-      "sha512-bd/YFLW+URhBzMXurx7lWByOu+xzU9+kb3RboOteXYDfW+tr+JZa99OyNmPINEGB/ahzKrEuc8rcv4gnpJmxTw=="
-    ],
-
-    "bun-types": [
-      "bun-types@1.2.5",
-      "",
-      { "dependencies": { "@types/node": "*", "@types/ws": "~8.5.10" } },
-      "sha512-3oO6LVGGRRKI4kHINx5PIdIgnLRb7l/SprhzqXapmoYkFl5m4j6EvALvbDVuuBFaamB46Ap6HCUxIXNLCGy+tg=="
-    ],
-
-    "typescript": [
-      "typescript@5.8.2",
-      "",
-      { "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" } },
-      "sha512-aJn6wq13/afZp/jT9QZmwEjDqqvSGp1VT5GVg+f/t6/oVyrgXM6BY1h9BRh/O5p3PlUPAe+WuiEZOmb/49RqoQ=="
-    ],
-
-    "undici-types": [
-      "undici-types@6.20.0",
-      "",
-      {},
-      "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg=="
-    ]
+    "@biomejs/biome": ["@biomejs/biome@1.9.4", "", { "optionalDependencies": { "@biomejs/cli-darwin-arm64": "1.9.4", "@biomejs/cli-darwin-x64": "1.9.4", "@biomejs/cli-linux-arm64": "1.9.4", "@biomejs/cli-linux-arm64-musl": "1.9.4", "@biomejs/cli-linux-x64": "1.9.4", "@biomejs/cli-linux-x64-musl": "1.9.4", "@biomejs/cli-win32-arm64": "1.9.4", "@biomejs/cli-win32-x64": "1.9.4" }, "bin": { "biome": "bin/biome" } }, "sha512-1rkd7G70+o9KkTn5KLmDYXihGoTaIGO9PIIN2ZB7UJxFrWw04CZHPYiMRjYsaDvVV7hP1dYNRLxSANLaBFGpog=="],
+
+    "@biomejs/cli-darwin-arm64": ["@biomejs/cli-darwin-arm64@1.9.4", "", { "os": "darwin", "cpu": "arm64" }, "sha512-bFBsPWrNvkdKrNCYeAp+xo2HecOGPAy9WyNyB/jKnnedgzl4W4Hb9ZMzYNbf8dMCGmUdSavlYHiR01QaYR58cw=="],
+
+    "@biomejs/cli-darwin-x64": ["@biomejs/cli-darwin-x64@1.9.4", "", { "os": "darwin", "cpu": "x64" }, "sha512-ngYBh/+bEedqkSevPVhLP4QfVPCpb+4BBe2p7Xs32dBgs7rh9nY2AIYUL6BgLw1JVXV8GlpKmb/hNiuIxfPfZg=="],
+
+    "@biomejs/cli-linux-arm64": ["@biomejs/cli-linux-arm64@1.9.4", "", { "os": "linux", "cpu": "arm64" }, "sha512-fJIW0+LYujdjUgJJuwesP4EjIBl/N/TcOX3IvIHJQNsAqvV2CHIogsmA94BPG6jZATS4Hi+xv4SkBBQSt1N4/g=="],
+
+    "@biomejs/cli-linux-arm64-musl": ["@biomejs/cli-linux-arm64-musl@1.9.4", "", { "os": "linux", "cpu": "arm64" }, "sha512-v665Ct9WCRjGa8+kTr0CzApU0+XXtRgwmzIf1SeKSGAv+2scAlW6JR5PMFo6FzqqZ64Po79cKODKf3/AAmECqA=="],
+
+    "@biomejs/cli-linux-x64": ["@biomejs/cli-linux-x64@1.9.4", "", { "os": "linux", "cpu": "x64" }, "sha512-lRCJv/Vi3Vlwmbd6K+oQ0KhLHMAysN8lXoCI7XeHlxaajk06u7G+UsFSO01NAs5iYuWKmVZjmiOzJ0OJmGsMwg=="],
+
+    "@biomejs/cli-linux-x64-musl": ["@biomejs/cli-linux-x64-musl@1.9.4", "", { "os": "linux", "cpu": "x64" }, "sha512-gEhi/jSBhZ2m6wjV530Yy8+fNqG8PAinM3oV7CyO+6c3CEh16Eizm21uHVsyVBEB6RIM8JHIl6AGYCv6Q6Q9Tg=="],
+
+    "@biomejs/cli-win32-arm64": ["@biomejs/cli-win32-arm64@1.9.4", "", { "os": "win32", "cpu": "arm64" }, "sha512-tlbhLk+WXZmgwoIKwHIHEBZUwxml7bRJgk0X2sPyNR3S93cdRq6XulAZRQJ17FYGGzWne0fgrXBKpl7l4M87Hg=="],
+
+    "@biomejs/cli-win32-x64": ["@biomejs/cli-win32-x64@1.9.4", "", { "os": "win32", "cpu": "x64" }, "sha512-8Y5wMhVIPaWe6jw2H+KlEm4wP/f7EW3810ZLmDlrEEy5KvBsb9ECEfu/kMWD484ijfQ8+nIi0giMgu9g1UAuuA=="],
+
+    "@postgrestools/backend-jsonrpc": ["@postgrestools/backend-jsonrpc@workspace:packages/@postgrestools/backend-jsonrpc"],
+
+    "@postgrestools/cli-aarch64-apple-darwin": ["@postgrestools/cli-aarch64-apple-darwin@0.13.0", "", { "os": "darwin", "cpu": "arm64" }, "sha512-LqgpsiupuNR1m8rSqcMdwep1UsSG5z7RZ9MYHODBB0+AsN/e1YzcyutqGeKs+AfDBdKdv7QmSbpf7KruBYL+tg=="],
+
+    "@postgrestools/cli-aarch64-linux-gnu": ["@postgrestools/cli-aarch64-linux-gnu@0.13.0", "", { "os": "linux", "cpu": "arm64" }, "sha512-QxZZBvg9qAo9raTA5cSuSXlrqo+eCUtYMWSR2dgDCEqogNlo/62ubWYgPi+SMEtfm9euqG1GOItxyRv6xUriEA=="],
+
+    "@postgrestools/cli-aarch64-windows-msvc": ["@postgrestools/cli-aarch64-windows-msvc@0.13.0", "", { "os": "win32", "cpu": "arm64" }, "sha512-C8BRZOPQA16eGL8Kk7D4M+9h2Y7x0GOJEBzjR3ZV54besoH8gcZqSxzaA8WbFczQ3dgEZ5CStny6asl3B5JMHA=="],
+
+    "@postgrestools/cli-x86_64-apple-darwin": ["@postgrestools/cli-x86_64-apple-darwin@0.13.0", "", { "os": "darwin", "cpu": "x64" }, "sha512-stbU4+en82DofjzpAQlfgKemJe1lbkGhuOAxfWce4jyT25+cil6cEWBia0hZyrve9sVEJctE1MHy9os8s3EGww=="],
+
+    "@postgrestools/cli-x86_64-linux-gnu": ["@postgrestools/cli-x86_64-linux-gnu@0.13.0", "", { "os": "linux", "cpu": "x64" }, "sha512-RPFdgcAiD+BWhSFw7suI0jTkJysHlHzrD4in27OGlKt9AvZ6TgKrCfDatUkn2VQfn6Ib8o/+1roFOKwFbfQIOw=="],
+
+    "@postgrestools/cli-x86_64-windows-msvc": ["@postgrestools/cli-x86_64-windows-msvc@0.13.0", "", { "os": "win32", "cpu": "x64" }, "sha512-4S6mbvc9u6ipeMcZHwX3RqGMJaNR9B5utMQN/N3LBnvLx62N9MHU1bk3bnGxfHoALXQTMq+us7M9GvEe1izGHQ=="],
+
+    "@postgrestools/postgrestools": ["@postgrestools/postgrestools@workspace:packages/@postgrestools/postgrestools"],
+
+    "@types/bun": ["@types/bun@1.2.5", "", { "dependencies": { "bun-types": "1.2.5" } }, "sha512-w2OZTzrZTVtbnJew1pdFmgV99H0/L+Pvw+z1P67HaR18MHOzYnTYOi6qzErhK8HyT+DB782ADVPPE92Xu2/Opg=="],
+
+    "@types/node": ["@types/node@22.13.10", "", { "dependencies": { "undici-types": "~6.20.0" } }, "sha512-I6LPUvlRH+O6VRUqYOcMudhaIdUVWfsjnZavnsraHvpBwaEyMN29ry+0UVJhImYL16xsscu0aske3yA+uPOWfw=="],
+
+    "@types/ws": ["@types/ws@8.5.14", "", { "dependencies": { "@types/node": "*" } }, "sha512-bd/YFLW+URhBzMXurx7lWByOu+xzU9+kb3RboOteXYDfW+tr+JZa99OyNmPINEGB/ahzKrEuc8rcv4gnpJmxTw=="],
+
+    "bun-types": ["bun-types@1.2.5", "", { "dependencies": { "@types/node": "*", "@types/ws": "~8.5.10" } }, "sha512-3oO6LVGGRRKI4kHINx5PIdIgnLRb7l/SprhzqXapmoYkFl5m4j6EvALvbDVuuBFaamB46Ap6HCUxIXNLCGy+tg=="],
+
+    "typescript": ["typescript@5.8.2", "", { "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" } }, "sha512-aJn6wq13/afZp/jT9QZmwEjDqqvSGp1VT5GVg+f/t6/oVyrgXM6BY1h9BRh/O5p3PlUPAe+WuiEZOmb/49RqoQ=="],
+
+    "undici-types": ["undici-types@6.20.0", "", {}, "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg=="],
   }
 }

packages/@postgrestools/postgrestools/bin/postgrestools

@@ -1,10 +1,6 @@
 #!/usr/bin/env node
 const { platform, arch, env } = process;
 
-/**
- * platform and arch are values injected into the node runtime.
- * We use the values documented on https://nodejs.org.
- */
 const PLATFORMS = {
   win32: {
     x64: "@postgrestools/cli-x86_64-windows-msvc/postgrestools.exe",
@@ -18,9 +14,40 @@ const PLATFORMS = {
     x64: "@postgrestools/cli-x86_64-linux-gnu/postgrestools",
     arm64: "@postgrestools/cli-aarch64-linux-gnu/postgrestools",
   },
+  "linux-musl": {
+    x64: "@postgrestools/cli-x86_64-linux-musl/postgrestools",
+    // no arm64 build for musl
+  },
 };
 
-const binPath = env.POSTGRESTOOLS_BINARY || PLATFORMS?.[platform]?.[arch];
+function isMusl() {
+  let stderr;
+  try {
+    stderr = execSync("ldd --version", {
+      stdio: [
+        "ignore", // stdin
+        "pipe", // stdout – glibc systems print here
+        "pipe", // stderr – musl systems print here
+      ],
+    });
+  } catch (err) {
+    stderr = err.stderr;
+  }
+  if (stderr.indexOf("musl") > -1) {
+    return true;
+  }
+  return false;
+}
+
+function getPlatform() {
+  if (platform === "linux") {
+    return isMusl() ? "linux-musl" : "linux";
+  }
+
+  return platform;
+}
+
+const binPath = env.POSTGRESTOOLS_BINARY || PLATFORMS?.[getPlatform()]?.[arch];
 
 if (binPath) {
   const result = require("child_process").spawnSync(

packages/@postgrestools/postgrestools/package.json

@@ -1,40 +1,44 @@
 {
-	"name": "@postgrestools/postgrestools",
-	"version": "<placeholder>",
-	"bin": {
-		"postgrestools": "bin/postgrestools"
-	},
-	"repository": {
-		"type": "git",
-		"url": "git+https://github.com/supabase-community/postgres-language-server.git",
-		"directory": "packages/@postgrestools/postgrestools"
-	},
-	"author": "Supabase Community",
-	"contributors": [
-		{
-			"name": "Philipp Steinrötter",
-			"url": "https://github.com/psteinroe"
-		},
-		{
-			"name": "Julian Domke",
-			"url": "https://github.com/juleswritescode"
-		}
-	],
-	"license": "MIT or Apache-2.0",
-	"description": "A collection of language tools and a Language Server Protocol (LSP) implementation for Postgres, focusing on developer experience and reliable SQL tooling.",
-	"files": ["bin/postgrestools", "schema.json"],
-	"engines": {
-		"node": ">=20"
-	},
-	"publishConfig": {
-		"provenance": true
-	},
-	"optionalDependencies": {
-		"@postgrestools/cli-x86_64-windows-msvc": "<placeholder>",
-		"@postgrestools/cli-aarch64-windows-msvc": "<placeholder>",
-		"@postgrestools/cli-x86_64-apple-darwin": "<placeholder>",
-		"@postgrestools/cli-aarch64-apple-darwin": "<placeholder>",
-		"@postgrestools/cli-x86_64-linux-gnu": "<placeholder>",
-		"@postgrestools/cli-aarch64-linux-gnu": "<placeholder>"
-	}
+  "name": "@postgrestools/postgrestools",
+  "version": "<placeholder>",
+  "bin": {
+    "postgrestools": "bin/postgrestools"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/supabase-community/postgres-language-server.git",
+    "directory": "packages/@postgrestools/postgrestools"
+  },
+  "author": "Supabase Community",
+  "contributors": [
+    {
+      "name": "Philipp Steinrötter",
+      "url": "https://github.com/psteinroe"
+    },
+    {
+      "name": "Julian Domke",
+      "url": "https://github.com/juleswritescode"
+    }
+  ],
+  "license": "MIT or Apache-2.0",
+  "description": "A collection of language tools and a Language Server Protocol (LSP) implementation for Postgres, focusing on developer experience and reliable SQL tooling.",
+  "files": [
+    "bin/postgrestools",
+    "schema.json"
+  ],
+  "engines": {
+    "node": ">=20"
+  },
+  "publishConfig": {
+    "provenance": true
+  },
+  "optionalDependencies": {
+    "@postgrestools/cli-x86_64-windows-msvc": "<placeholder>",
+    "@postgrestools/cli-aarch64-windows-msvc": "<placeholder>",
+    "@postgrestools/cli-x86_64-apple-darwin": "<placeholder>",
+    "@postgrestools/cli-aarch64-apple-darwin": "<placeholder>",
+    "@postgrestools/cli-x86_64-linux-gnu": "<placeholder>",
+    "@postgrestools/cli-aarch64-linux-gnu": "<placeholder>",
+    "@postgrestools/cli-x86_64-linux-musl": "<placeholder>"
+  }
 }