From 646d1adf73c2d154a00f5d33702093a974c200f6 Mon Sep 17 00:00:00 2001 From: SilasMarvin <19626586+SilasMarvin@users.noreply.github.com> Date: Wed, 6 Sep 2023 15:11:21 -0700 Subject: [PATCH 1/7] Initial testing --- .github/workflows/javascript-sdk.yml | 51 +++++++++++++++++++++++++--- 1 file changed, 47 insertions(+), 4 deletions(-) diff --git a/.github/workflows/javascript-sdk.yml b/.github/workflows/javascript-sdk.yml index f86800a25..b79a2d3cf 100644 --- a/.github/workflows/javascript-sdk.yml +++ b/.github/workflows/javascript-sdk.yml @@ -2,10 +2,14 @@ name: deploy javascript sdk on: workflow_dispatch: jobs: - build-javascript-sdk: + build-javascript-sdk-macos-windows: strategy: matrix: - os: ["ubuntu-22.04", "buildjet-4vcpu-ubuntu-2204-arm", "macos-latest", "windows-latest"] + os: + [ + "macos-latest", + "windows-latest", + ] include: - neon-out-name: "x86_64-unknown-linux-gnu-index.node" os: "ubuntu-22.04" @@ -37,7 +41,46 @@ jobs: - name: Upload built .node file uses: actions/upload-artifact@v3 with: - name: node-artifacts + name: node-artifacts + path: pgml-sdks/pgml/javascript/dist/${{ matrix.neon-out-name }} + retention-days: 1 + build-javascript-sdk-linux: + strategy: + matrix: + os: + [ + "macos-latest", + "windows-latest", + ] + include: + - neon-out-name: "x86_64-unknown-linux-gnu-index.node" + os: "ubuntu-22.04" + - neon-out-name: "aarch64-unknown-linux-gnu-index.node" + os: "buildjet-4vcpu-ubuntu-2204-arm" + runs-on: ubuntu-latest + container: ubuntu:16.04 + defaults: + run: + working-directory: pgml-sdks/pgml/javascript + steps: + - uses: actions/checkout@v3 + - uses: actions-rs/toolchain@v1 + with: + toolchain: stable + - name: Validate cargo is working + uses: postgresml/gh-actions-cargo@master + with: + command: version + - name: Do build + env: + TYPESCRIPT_DECLARATION_FILE: "javascript/index.d.ts" + run: | + npm i + npm run build-release + - name: Upload built .node file + uses: actions/upload-artifact@v3 + with: + name: node-artifacts path: pgml-sdks/pgml/javascript/dist/${{ matrix.neon-out-name }} retention-days: 1 # publish-javascript-sdk: @@ -69,7 +112,7 @@ jobs: # - name: Generate types declaration # run: | # npm i - # npm run build + # npm run build # rm index.node # - run: npm ci # - run: npm publish From 87f4c16f5a9cb057da982f11e714ca13ca10b364 Mon Sep 17 00:00:00 2001 From: SilasMarvin <19626586+SilasMarvin@users.noreply.github.com> Date: Wed, 6 Sep 2023 15:17:15 -0700 Subject: [PATCH 2/7] Debugging --- .github/workflows/javascript-sdk.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/javascript-sdk.yml b/.github/workflows/javascript-sdk.yml index b79a2d3cf..c3be9fda4 100644 --- a/.github/workflows/javascript-sdk.yml +++ b/.github/workflows/javascript-sdk.yml @@ -64,6 +64,9 @@ jobs: working-directory: pgml-sdks/pgml/javascript steps: - uses: actions/checkout@v3 + - name: Install dependencies + run: | + apt-get -y install curl - uses: actions-rs/toolchain@v1 with: toolchain: stable From 2d129962fd05f3899b21c4b22cb4241bf597599a Mon Sep 17 00:00:00 2001 From: SilasMarvin <19626586+SilasMarvin@users.noreply.github.com> Date: Wed, 6 Sep 2023 15:19:39 -0700 Subject: [PATCH 3/7] Debugging --- .github/workflows/javascript-sdk.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/javascript-sdk.yml b/.github/workflows/javascript-sdk.yml index c3be9fda4..8c8cc97fd 100644 --- a/.github/workflows/javascript-sdk.yml +++ b/.github/workflows/javascript-sdk.yml @@ -66,6 +66,7 @@ jobs: - uses: actions/checkout@v3 - name: Install dependencies run: | + apt update apt-get -y install curl - uses: actions-rs/toolchain@v1 with: From 940a4eab893e0108709821f8403625c3a5b71463 Mon Sep 17 00:00:00 2001 From: SilasMarvin <19626586+SilasMarvin@users.noreply.github.com> Date: Wed, 6 Sep 2023 15:24:48 -0700 Subject: [PATCH 4/7] Debugging --- .github/workflows/javascript-sdk.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/javascript-sdk.yml b/.github/workflows/javascript-sdk.yml index 8c8cc97fd..a1ead28be 100644 --- a/.github/workflows/javascript-sdk.yml +++ b/.github/workflows/javascript-sdk.yml @@ -75,6 +75,9 @@ jobs: uses: postgresml/gh-actions-cargo@master with: command: version + - uses: actions/setup-node@v3 + with: + node-version: 18 - name: Do build env: TYPESCRIPT_DECLARATION_FILE: "javascript/index.d.ts" From ad2118975201edd86f56ba79dc9eae36a312e2be Mon Sep 17 00:00:00 2001 From: SilasMarvin <19626586+SilasMarvin@users.noreply.github.com> Date: Wed, 6 Sep 2023 15:31:40 -0700 Subject: [PATCH 5/7] Debugging --- .github/workflows/javascript-sdk.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/javascript-sdk.yml b/.github/workflows/javascript-sdk.yml index a1ead28be..c8a0d6b5c 100644 --- a/.github/workflows/javascript-sdk.yml +++ b/.github/workflows/javascript-sdk.yml @@ -77,7 +77,7 @@ jobs: command: version - uses: actions/setup-node@v3 with: - node-version: 18 + node-version: 16 - name: Do build env: TYPESCRIPT_DECLARATION_FILE: "javascript/index.d.ts" From 91bdcd4071f271a29dc042d8015ff364d45b018c Mon Sep 17 00:00:00 2001 From: SilasMarvin <19626586+SilasMarvin@users.noreply.github.com> Date: Wed, 6 Sep 2023 15:39:48 -0700 Subject: [PATCH 6/7] Debugging --- .github/workflows/javascript-sdk.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/javascript-sdk.yml b/.github/workflows/javascript-sdk.yml index c8a0d6b5c..7bdd479b7 100644 --- a/.github/workflows/javascript-sdk.yml +++ b/.github/workflows/javascript-sdk.yml @@ -68,6 +68,7 @@ jobs: run: | apt update apt-get -y install curl + apt-get -y install build-essential - uses: actions-rs/toolchain@v1 with: toolchain: stable From 0c054b63866362463ccda556a8750349c50d5b9b Mon Sep 17 00:00:00 2001 From: SilasMarvin <19626586+SilasMarvin@users.noreply.github.com> Date: Wed, 6 Sep 2023 15:52:20 -0700 Subject: [PATCH 7/7] Debugging --- .github/workflows/javascript-sdk.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/javascript-sdk.yml b/.github/workflows/javascript-sdk.yml index 7bdd479b7..8e929976e 100644 --- a/.github/workflows/javascript-sdk.yml +++ b/.github/workflows/javascript-sdk.yml @@ -49,8 +49,8 @@ jobs: matrix: os: [ - "macos-latest", - "windows-latest", + "ubuntu-22.04", + "buildjet-4vcpu-ubuntu-2204-arm", ] include: - neon-out-name: "x86_64-unknown-linux-gnu-index.node"