From 693e46178f502d4d1018c86cc23dfa39c3c0f1a5 Mon Sep 17 00:00:00 2001 From: Ilja Rotar Date: Tue, 18 Aug 2026 10:56:41 +0200 Subject: [PATCH 1/4] Fix npm publish --- .github/workflows/main.yml | 2 +- .github/workflows/npm-publish.yaml | 2 +- .github/workflows/tests.yml | 2 +- js/bun.lock => bun.lock | 0 js/Makefile | 3 ++- js/package.json => package.json | 4 ++-- 6 files changed, 7 insertions(+), 6 deletions(-) rename js/bun.lock => bun.lock (100%) rename js/package.json => package.json (89%) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index d7d86eb3..b9f830d1 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -51,7 +51,7 @@ jobs: uses: oven-sh/setup-bun@v2 - name: Install dependencies - run: cd js && bun install --frozen-lockfile + run: bun install --frozen-lockfile - name: build run: make build diff --git a/.github/workflows/npm-publish.yaml b/.github/workflows/npm-publish.yaml index 86c56ea8..a547242a 100644 --- a/.github/workflows/npm-publish.yaml +++ b/.github/workflows/npm-publish.yaml @@ -31,7 +31,7 @@ jobs: uses: oven-sh/setup-bun@v2 - name: Install dependencies - run: cd js && bun install --frozen-lockfile + run: bun install --frozen-lockfile - name: build run: make build diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 3896deda..45cfe50a 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -74,7 +74,7 @@ jobs: uses: oven-sh/setup-bun@v2 - name: Install dependencies - run: cd js && bun install --frozen-lockfile + run: bun install --frozen-lockfile - name: Run tests run: make -C js test diff --git a/js/bun.lock b/bun.lock similarity index 100% rename from js/bun.lock rename to bun.lock diff --git a/js/Makefile b/js/Makefile index c631affe..7c5059fb 100644 --- a/js/Makefile +++ b/js/Makefile @@ -12,10 +12,11 @@ clean: .PHONY: build build: install ifeq ($(CI),true) + cd .. &&\ yq e -i -o=json ".version=\"$(VERSION_STRIPPED)\"" package.json &&\ yq e -o=json ".version" package.json endif - bun run build + cd .. && bun run build .PHONY: test test: diff --git a/js/package.json b/package.json similarity index 89% rename from js/package.json rename to package.json index 54091740..0879a818 100644 --- a/js/package.json +++ b/package.json @@ -3,7 +3,7 @@ "description": "metal-stack api typescript client", "repository": "https://github.com/metal-stack/api.git", "scripts": { - "build": "tsc --project tsconfig.json", + "build": "tsc --project js/tsconfig.json", "test": "echo \"Error: no test specified\" && exit 1" }, "author": "metal-stack.io", @@ -18,7 +18,7 @@ "typescript": "^7.0.2" }, "files": [ - "./*" + "js/*" ], "version": "0.0.0" } \ No newline at end of file From 68161e6dea1b953be8c13b91ad2ceb830ecad86e Mon Sep 17 00:00:00 2001 From: Ilja Rotar Date: Tue, 18 Aug 2026 11:30:43 +0200 Subject: [PATCH 2/4] Revert "Fix npm publish" This reverts commit 693e46178f502d4d1018c86cc23dfa39c3c0f1a5. --- .github/workflows/main.yml | 2 +- .github/workflows/npm-publish.yaml | 2 +- .github/workflows/tests.yml | 2 +- js/Makefile | 3 +-- bun.lock => js/bun.lock | 0 package.json => js/package.json | 4 ++-- 6 files changed, 6 insertions(+), 7 deletions(-) rename bun.lock => js/bun.lock (100%) rename package.json => js/package.json (89%) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index b9f830d1..d7d86eb3 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -51,7 +51,7 @@ jobs: uses: oven-sh/setup-bun@v2 - name: Install dependencies - run: bun install --frozen-lockfile + run: cd js && bun install --frozen-lockfile - name: build run: make build diff --git a/.github/workflows/npm-publish.yaml b/.github/workflows/npm-publish.yaml index a547242a..86c56ea8 100644 --- a/.github/workflows/npm-publish.yaml +++ b/.github/workflows/npm-publish.yaml @@ -31,7 +31,7 @@ jobs: uses: oven-sh/setup-bun@v2 - name: Install dependencies - run: bun install --frozen-lockfile + run: cd js && bun install --frozen-lockfile - name: build run: make build diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 45cfe50a..3896deda 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -74,7 +74,7 @@ jobs: uses: oven-sh/setup-bun@v2 - name: Install dependencies - run: bun install --frozen-lockfile + run: cd js && bun install --frozen-lockfile - name: Run tests run: make -C js test diff --git a/js/Makefile b/js/Makefile index 7c5059fb..c631affe 100644 --- a/js/Makefile +++ b/js/Makefile @@ -12,11 +12,10 @@ clean: .PHONY: build build: install ifeq ($(CI),true) - cd .. &&\ yq e -i -o=json ".version=\"$(VERSION_STRIPPED)\"" package.json &&\ yq e -o=json ".version" package.json endif - cd .. && bun run build + bun run build .PHONY: test test: diff --git a/bun.lock b/js/bun.lock similarity index 100% rename from bun.lock rename to js/bun.lock diff --git a/package.json b/js/package.json similarity index 89% rename from package.json rename to js/package.json index 0879a818..54091740 100644 --- a/package.json +++ b/js/package.json @@ -3,7 +3,7 @@ "description": "metal-stack api typescript client", "repository": "https://github.com/metal-stack/api.git", "scripts": { - "build": "tsc --project js/tsconfig.json", + "build": "tsc --project tsconfig.json", "test": "echo \"Error: no test specified\" && exit 1" }, "author": "metal-stack.io", @@ -18,7 +18,7 @@ "typescript": "^7.0.2" }, "files": [ - "js/*" + "./*" ], "version": "0.0.0" } \ No newline at end of file From 11742a7e57f1743e2a6c2eecae46e02c44a3c0dc Mon Sep 17 00:00:00 2001 From: Ilja Rotar Date: Tue, 18 Aug 2026 11:31:22 +0200 Subject: [PATCH 3/4] publish from js dir --- .github/workflows/npm-publish.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/npm-publish.yaml b/.github/workflows/npm-publish.yaml index 86c56ea8..277d7fed 100644 --- a/.github/workflows/npm-publish.yaml +++ b/.github/workflows/npm-publish.yaml @@ -37,5 +37,5 @@ jobs: run: make build - name: Publish to npm - run: bunx npm@11.8.0 publish --provenance # workaround for bun not supporting trusted publishing of npm (https://github.com/oven-sh/bun/issues/15601) + run: cd js && bunx npm@11.8.0 publish --provenance # workaround for bun not supporting trusted publishing of npm (https://github.com/oven-sh/bun/issues/15601) if: github.event_name == 'release' From ad7c6ea8df6dfcbc839f32e1eb3b239ced9805cb Mon Sep 17 00:00:00 2001 From: Ilja Rotar Date: Tue, 18 Aug 2026 11:33:20 +0200 Subject: [PATCH 4/4] working dir instead of cd --- .github/workflows/main.yml | 3 ++- .github/workflows/npm-publish.yaml | 6 ++++-- .github/workflows/tests.yml | 3 ++- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index d7d86eb3..f17a03a6 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -51,7 +51,8 @@ jobs: uses: oven-sh/setup-bun@v2 - name: Install dependencies - run: cd js && bun install --frozen-lockfile + working-directory: js + run: bun install --frozen-lockfile - name: build run: make build diff --git a/.github/workflows/npm-publish.yaml b/.github/workflows/npm-publish.yaml index 277d7fed..360ff191 100644 --- a/.github/workflows/npm-publish.yaml +++ b/.github/workflows/npm-publish.yaml @@ -31,11 +31,13 @@ jobs: uses: oven-sh/setup-bun@v2 - name: Install dependencies - run: cd js && bun install --frozen-lockfile + working-directory: js + run: bun install --frozen-lockfile - name: build run: make build - name: Publish to npm - run: cd js && bunx npm@11.8.0 publish --provenance # workaround for bun not supporting trusted publishing of npm (https://github.com/oven-sh/bun/issues/15601) + working-directory: js + run: bunx npm@11.8.0 publish --provenance # workaround for bun not supporting trusted publishing of npm (https://github.com/oven-sh/bun/issues/15601) if: github.event_name == 'release' diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 3896deda..2119f85a 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -74,7 +74,8 @@ jobs: uses: oven-sh/setup-bun@v2 - name: Install dependencies - run: cd js && bun install --frozen-lockfile + working-directory: js + run: bun install --frozen-lockfile - name: Run tests run: make -C js test