From ac74afcca54d4040bfe525210a0f8755c87ca0d1 Mon Sep 17 00:00:00 2001 From: Dominic Pelini <111786059+DomPeliniAerospike@users.noreply.github.com> Date: Wed, 21 Feb 2024 08:10:06 -0700 Subject: [PATCH 01/30] Update build-bindings.yml --- .github/workflows/build-bindings.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-bindings.yml b/.github/workflows/build-bindings.yml index 7b846a3f0..c65eebb16 100644 --- a/.github/workflows/build-bindings.yml +++ b/.github/workflows/build-bindings.yml @@ -98,7 +98,7 @@ jobs: ] platform: [ "x86_64", - #"aarch64" + "aarch64" ] steps: From f631522b094b6991b9263e708b968491e26505b3 Mon Sep 17 00:00:00 2001 From: Dominic Pelini <111786059+DomPeliniAerospike@users.noreply.github.com> Date: Wed, 21 Feb 2024 08:10:27 -0700 Subject: [PATCH 02/30] revert --- .github/workflows/build-bindings.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-bindings.yml b/.github/workflows/build-bindings.yml index c65eebb16..7b846a3f0 100644 --- a/.github/workflows/build-bindings.yml +++ b/.github/workflows/build-bindings.yml @@ -98,7 +98,7 @@ jobs: ] platform: [ "x86_64", - "aarch64" + #"aarch64" ] steps: From e416d06d0e412b851f8663f1c4a2eb6e9a7f1607 Mon Sep 17 00:00:00 2001 From: Dominic Pelini <111786059+DomPeliniAerospike@users.noreply.github.com> Date: Wed, 21 Feb 2024 08:11:21 -0700 Subject: [PATCH 03/30] Update build-bindings.yml --- .github/workflows/build-bindings.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-bindings.yml b/.github/workflows/build-bindings.yml index 7b846a3f0..c65eebb16 100644 --- a/.github/workflows/build-bindings.yml +++ b/.github/workflows/build-bindings.yml @@ -98,7 +98,7 @@ jobs: ] platform: [ "x86_64", - #"aarch64" + "aarch64" ] steps: From 15d536e8cc6ab4326eb7a44269e715e0308296c4 Mon Sep 17 00:00:00 2001 From: Dominic Pelini <111786059+DomPeliniAerospike@users.noreply.github.com> Date: Wed, 21 Feb 2024 08:26:02 -0700 Subject: [PATCH 04/30] Update build-bindings.yml --- .github/workflows/build-bindings.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-bindings.yml b/.github/workflows/build-bindings.yml index c65eebb16..950480a4d 100644 --- a/.github/workflows/build-bindings.yml +++ b/.github/workflows/build-bindings.yml @@ -173,8 +173,9 @@ jobs: apt update apt install -y g++ libssl-dev zlib1g-dev make build-essential libuv1-dev wget curl ./scripts/build-c-client.sh + ls -a + ls -a wget https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.3/install.sh | bash; - source ~/.bashrc; nvm i 20 npm install From a6efbba27b4bfc363d52648a3cd2ae26c0a87e1e Mon Sep 17 00:00:00 2001 From: Dominic Pelini <111786059+DomPeliniAerospike@users.noreply.github.com> Date: Wed, 21 Feb 2024 09:22:53 -0700 Subject: [PATCH 05/30] Update build-bindings.yml --- .github/workflows/build-bindings.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-bindings.yml b/.github/workflows/build-bindings.yml index 950480a4d..dbb45178d 100644 --- a/.github/workflows/build-bindings.yml +++ b/.github/workflows/build-bindings.yml @@ -167,7 +167,7 @@ jobs: with: arch: aarch64 distro: ubuntu22.04 - + shell: bash # Set an output parameter `uname` for use in subsequent steps run: | apt update @@ -176,6 +176,10 @@ jobs: ls -a ls -a wget https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.3/install.sh | bash; + echo "export NVM_DIR="$HOME/.nvm" + [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm + [ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # This loads nvm bash_completion" > ~/.bashrc + source ~/.bashrc nvm i 20 npm install From 5e00be28c0898fa5f131d1947d658a8428f18800 Mon Sep 17 00:00:00 2001 From: Dominic Pelini <111786059+DomPeliniAerospike@users.noreply.github.com> Date: Wed, 21 Feb 2024 09:29:14 -0700 Subject: [PATCH 06/30] Update build-bindings.yml --- .github/workflows/build-bindings.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/build-bindings.yml b/.github/workflows/build-bindings.yml index dbb45178d..b1df1faf4 100644 --- a/.github/workflows/build-bindings.yml +++ b/.github/workflows/build-bindings.yml @@ -167,7 +167,6 @@ jobs: with: arch: aarch64 distro: ubuntu22.04 - shell: bash # Set an output parameter `uname` for use in subsequent steps run: | apt update From b6207a972be962001d7c093db93311ed67e5f1c3 Mon Sep 17 00:00:00 2001 From: Dominic Pelini <111786059+DomPeliniAerospike@users.noreply.github.com> Date: Wed, 21 Feb 2024 09:41:09 -0700 Subject: [PATCH 07/30] Update build-bindings.yml --- .github/workflows/build-bindings.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build-bindings.yml b/.github/workflows/build-bindings.yml index b1df1faf4..10c1bdeff 100644 --- a/.github/workflows/build-bindings.yml +++ b/.github/workflows/build-bindings.yml @@ -167,6 +167,7 @@ jobs: with: arch: aarch64 distro: ubuntu22.04 + shell: /bin/bash # Set an output parameter `uname` for use in subsequent steps run: | apt update From ba60825f619f04505697e036a218345c7b66da35 Mon Sep 17 00:00:00 2001 From: Dominic Pelini <111786059+DomPeliniAerospike@users.noreply.github.com> Date: Wed, 21 Feb 2024 09:54:58 -0700 Subject: [PATCH 08/30] Update build-bindings.yml --- .github/workflows/build-bindings.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-bindings.yml b/.github/workflows/build-bindings.yml index 10c1bdeff..8833555fb 100644 --- a/.github/workflows/build-bindings.yml +++ b/.github/workflows/build-bindings.yml @@ -175,10 +175,10 @@ jobs: ./scripts/build-c-client.sh ls -a ls -a - wget https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.3/install.sh | bash; - echo "export NVM_DIR="$HOME/.nvm" - [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm - [ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # This loads nvm bash_completion" > ~/.bashrc + wget -qO- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.3/install.sh | bash + echo 'export NVM_DIR="$HOME/.nvm"' >> ~/.bashrc + echo '[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm' >> ~/.bashrc + echo '[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # This loads nvm bash_completion' >> ~/.bashrc source ~/.bashrc nvm i 20 npm install From e19407fb12039c334a057570322ed19031d5f8ca Mon Sep 17 00:00:00 2001 From: Dominic Pelini <111786059+DomPeliniAerospike@users.noreply.github.com> Date: Wed, 21 Feb 2024 10:07:30 -0700 Subject: [PATCH 09/30] Update build-bindings.yml --- .github/workflows/build-bindings.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-bindings.yml b/.github/workflows/build-bindings.yml index 8833555fb..2dc8e3ffa 100644 --- a/.github/workflows/build-bindings.yml +++ b/.github/workflows/build-bindings.yml @@ -176,9 +176,10 @@ jobs: ls -a ls -a wget -qO- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.3/install.sh | bash - echo 'export NVM_DIR="$HOME/.nvm"' >> ~/.bashrc - echo '[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm' >> ~/.bashrc - echo '[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # This loads nvm bash_completion' >> ~/.bashrc + export NVM_DIR="$HOME/.nvm" + [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm + [ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # This loads nvm bash_completion + ls source ~/.bashrc nvm i 20 npm install From 6ecfc9f6145e7c0d33b8e0a4e2d5e79328241ee4 Mon Sep 17 00:00:00 2001 From: Dominic Pelini <111786059+DomPeliniAerospike@users.noreply.github.com> Date: Wed, 21 Feb 2024 10:17:30 -0700 Subject: [PATCH 10/30] Update build-bindings.yml --- .github/workflows/build-bindings.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/build-bindings.yml b/.github/workflows/build-bindings.yml index 2dc8e3ffa..e04cadadb 100644 --- a/.github/workflows/build-bindings.yml +++ b/.github/workflows/build-bindings.yml @@ -180,7 +180,6 @@ jobs: [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm [ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # This loads nvm bash_completion ls - source ~/.bashrc nvm i 20 npm install From 8c278df01dc425f29d601a8e1813b087448d2bf4 Mon Sep 17 00:00:00 2001 From: Dominic Pelini <111786059+DomPeliniAerospike@users.noreply.github.com> Date: Wed, 21 Feb 2024 10:46:01 -0700 Subject: [PATCH 11/30] Update build-bindings.yml --- .github/workflows/build-bindings.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-bindings.yml b/.github/workflows/build-bindings.yml index e04cadadb..34d2dfe83 100644 --- a/.github/workflows/build-bindings.yml +++ b/.github/workflows/build-bindings.yml @@ -171,7 +171,7 @@ jobs: # Set an output parameter `uname` for use in subsequent steps run: | apt update - apt install -y g++ libssl-dev zlib1g-dev make build-essential libuv1-dev wget curl + apt install -y g++ libssl-dev zlib1g-dev make build-essential libuv1-dev wget curl python3 ./scripts/build-c-client.sh ls -a ls -a From 26b01c3a6fb8620e8fbc1747267cde7d8c8edacc Mon Sep 17 00:00:00 2001 From: Dominic Pelini <111786059+DomPeliniAerospike@users.noreply.github.com> Date: Wed, 21 Feb 2024 12:04:26 -0700 Subject: [PATCH 12/30] Update build-bindings.yml --- .github/workflows/build-bindings.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/build-bindings.yml b/.github/workflows/build-bindings.yml index 34d2dfe83..7c3ffe899 100644 --- a/.github/workflows/build-bindings.yml +++ b/.github/workflows/build-bindings.yml @@ -182,6 +182,7 @@ jobs: ls nvm i 20 npm install + ${{ env.TEST_COMMAND }} - name: Build client x64 if: ${{ matrix.platform != 'aarch64' }} @@ -196,6 +197,7 @@ jobs: CFLAGS: '-Werror' - name: Test client + if: ${{ matrix.platform != 'aarch64' }} run: | ${{ env.TEST_COMMAND }} From 5ebc5df9a8724e59db06807ffce00d2f101acac4 Mon Sep 17 00:00:00 2001 From: Dominic Pelini <111786059+DomPeliniAerospike@users.noreply.github.com> Date: Wed, 21 Feb 2024 14:30:19 -0700 Subject: [PATCH 13/30] Added more action documentation --- .github/workflows/build-bindings.yml | 128 ++++++++++++++++++++------- .github/workflows/tests.yml | 81 +++++++---------- 2 files changed, 127 insertions(+), 82 deletions(-) diff --git a/.github/workflows/build-bindings.yml b/.github/workflows/build-bindings.yml index 7c3ffe899..7a8f1cb1f 100644 --- a/.github/workflows/build-bindings.yml +++ b/.github/workflows/build-bindings.yml @@ -143,16 +143,6 @@ jobs: if: ${{ !contains(github.event.pull_request.labels.*.name, 'new-server-features') }} run: docker run -d --name aerospike -p 3000-3002:3000-3002 aerospike/aerospike-server -# - name: Set config.conf to use Docker IP address of Aerospike server -# # config.conf should be copied into the cibuildwheel Docker container -# run: | -# export SERVER_DOCKER_IP=$(docker container inspect -f '{{ .NetworkSettings.IPAddress }}' aerospike) -# # Install crudini -# pip install crudini -c ../.github/workflows/requirements.txt -# sed -i "s/127.0.0.1:3000//" config.conf -# crudini --set config.conf enterprise-edition hosts ${SERVER_DOCKER_IP}:3000 -# working-directory: test - - name: Enable tests run: echo "TEST_COMMAND=npm test -- --h 127.0.0.1 --port 3000" >> $GITHUB_ENV @@ -170,6 +160,7 @@ jobs: shell: /bin/bash # Set an output parameter `uname` for use in subsequent steps run: | + docker run -d --name aerospike -p 3000-3002:3000-3002 aerospike/aerospike-server apt update apt install -y g++ libssl-dev zlib1g-dev make build-essential libuv1-dev wget curl python3 ./scripts/build-c-client.sh @@ -439,10 +430,13 @@ jobs: npm install -g json json -I -f package.json -e "this.scripts.install=\"npm-run-all removeExtraBinaries build\"" - - name: Run tests + - name: make test directory + run: | + mkdir -p testDir + + - name: Install package using npm + working-directory: testDir run: | - mkdir -p testDir - cd testDir npm install .. test-yarn-install: @@ -465,12 +459,22 @@ jobs: npm install -g json json -I -f package.json -e "this.scripts.install=\"npm-run-all removeExtraBinaries build\"" - - name: Run tests + - name: make test directory + run: | + mkdir -p testDir + + - name: run yarn link on source package + run: | + yarn link + + - name: Install yarn + working-directory: testDir + run: | + npm install --global yarn + + - name: Install package using yarn + working-directory: testDir run: | - mkdir -p testDir - yarn link - cd testDir - npm install --global yarn yarn add link:.. test-pnpm-install: @@ -493,13 +497,27 @@ jobs: npm install -g json json -I -f package.json -e "this.scripts.install=\"npm-run-all removeExtraBinaries build\"" - - name: Run tests + - name: make test directory run: | mkdir -p testDir - cd testDir + + - name: Install pnpm + working-directory: testDir + run: | npm install --global pnpm + + - name: Set shell enviornment variable + working-directory: testDir + run: | SHELL=bash pnpm setup + + - name: Refresh bashrc + run: | source /home/runner/.bashrc + + - name: Install package using pnpm + working-directory: testDir + run: | pnpm install .. test-bun-install: @@ -522,36 +540,60 @@ jobs: npm install -g json json -I -f package.json -e "this.scripts.install=\"npm-run-all removeExtraBinaries build\"" - - name: Run tests + - name: Install bun run: | npm install -g bun - bun link + + - name: run bun link on source package + run: | + bun link + + - name: make test directory + run: | mkdir -p testDir - cd testDir + + - name: run bun link on source package + working-directory: testDir + run: | bun link aerospike test-typescript-install: runs-on: ubuntu-latest needs: [manylinux, macOS-x86] + strategy: + matrix: + node-version: [ + "20", + ] + fail-fast: false + steps: - uses: actions/checkout@v2 with: submodules: recursive - - uses: ./.github/workflows/combine-bindings/ - - uses: actions/setup-node@v4 with: - node-version: ${{ env.LOWEST_SUPPORTED_NODEJS_VERSION }} + node-version: ${{ matrix.node-version }} architecture: 'x64' + - uses: actions/download-artifact@v4 + with: + name: binding-${{ matrix.node-version }} + + - name: make binding folder + run: mkdir lib/binding + + - name: Install client + run: | + cp -r node-v115-linux-x64 lib/binding/node-v115-linux-x64 + - if: ${{ contains(github.event.pull_request.labels.*.name, 'new-server-features') }} uses: docker/login-action@v3 with: username: ${{ secrets.DOCKER_HUB_BOT_USERNAME }} password: ${{ secrets.DOCKER_HUB_BOT_PW }} - - name: Run Aerospike server release candidate with latest tag if: ${{ contains(github.event.pull_request.labels.*.name, 'new-server-features') }} run: docker run -d --name aerospike -p 3000-3002:3000-3002 aerospike/aerospike-server-rc:latest @@ -564,17 +606,37 @@ jobs: run: | npm install -g json json -I -f package.json -e "this.scripts.install=\"npm-run-all removeExtraBinaries build\"" - - - name: Run tests - run: | + + - name: Make package directory mkdir my-aerospike-project - cd my-aerospike-project + + - name: Initialize npm project + working-directory: my-aerospike-project + run: | npm init -y + + - name: Install typescript as a developer dependency + working-directory: my-aerospike-project + run: | npm install typescript ts-node --save-dev + + - name: Install aerospike as dependency in npm project + working-directory: my-aerospike-project + run: | npm install .. + + - name: copy typescript example to npm project + working-directory: my-aerospike-project + run: | cp ../examples/typescript.ts index.ts - npx tsc index.ts - node index.js + - name: Compile the project in typescript + working-directory: my-aerospike-project + run: | + npx tsc index.ts + - name: Run the compile javascript test + working-directory: my-aerospike-project + run: | + node index.js \ No newline at end of file diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 2b2ab7ef7..58c3ae264 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -27,9 +27,11 @@ jobs: lint: runs-on: ubuntu-latest steps: + - uses: actions/checkout@v4 with: submodules: recursive + - name: install standard run: npm install standard @@ -51,16 +53,18 @@ jobs: with: node-version: ${{ matrix.nodejs-version }} architecture: 'x64' + - name: debugging run: | echo "LOWEST_SUPPORTED_NODEJS_VERSION: $LOWEST_SUPPORTED_NODEJS_VERSION" - - run: sudo apt update + - name: Download most recent package information + run: sudo apt update - name: Install build dependencies (C Client dependency packages) run: sudo apt install g++ libssl-dev zlib1g-dev; - name: Install build dependencies (make) run: sudo apt-get install -y make; - - name: Install build dependencies (make) + - name: Install build dependencies run: sudo apt install build-essential; - name: Build client @@ -70,56 +74,12 @@ jobs: env: CFLAGS: '-Werror' - - name: list - run: ls lib/binding - name: Send binding to test jobs uses: actions/upload-artifact@v4 with: name: binding-${{ matrix.nodejs-version }} path: ./lib/binding/node-*-linux-x64/ -# test-memray: -# needs: build-ubuntu -# runs-on: ubuntu-latest -# steps: -# - uses: actions/checkout@v4 -# -# - uses: actions/setup-node@v4 -# with: -# node-version: ${{ matrix.nodejs-version }} -# architecture: 'x64' -# -# - uses: actions/download-artifact@v4 -# with: -# name: binding-18 -# -# - name: make binding folder -# run: mkdir lib/binding -# -# - name: Install client -# run: cp -r install node-v108-linux-x64 lib/binding/node-v108-linux-x64 -# -# - name: Install client -# run: npm install . -# -# - name: Run Aerospike server -# run: docker run -d --name aerospike -p 3000-3002:3000-3002 aerospike/aerospike-server -# -# - name: Wait for database to be ready -# # Should be ready after 3 seconds -# run: sleep 3 -# -# - name: Get number of tests -# run: echo "NUM_TESTS=$(npm run test-dry-run | grep -oP '\d+ (passing|pending)' | awk '{ sum += $1 } END { print sum }')" >> $GITHUB_ENV -# working-directory: test -# -# - name: Run tests -# # Get number of tests since setting to 0 doesn't work properly -# # pytest-memray currently throws a ZeroDivision error due to having a bug -# # We ignore this for now -# run: python -m pytest ./new_tests --memray --memray-bin-path=./ --most-allocations=${{ env.NUM_TESTS }} || true -# working-directory: test - # Run this when testing new server features on server release candidate # to make sure the tests don't regress on the last server release. test-ce-latest-release: @@ -417,13 +377,36 @@ jobs: if: ${{ !contains(github.event.pull_request.labels.*.name, 'new-server-features') }} run: docker run -d --name aerospike -p 3000-3002:3000-3002 aerospike/aerospike-server - - name: Modify the package.json - run: | + - name: Make package directory mkdir my-aerospike-project - cd my-aerospike-project + + - name: Initialize npm project + working-directory: my-aerospike-project + run: | npm init -y + + - name: Install typescript as a developer dependency + working-directory: my-aerospike-project + run: | npm install typescript ts-node --save-dev + + - name: Install aerospike as dependency in npm project + working-directory: my-aerospike-project + run: | npm install .. + + - name: copy typescript example to npm project + working-directory: my-aerospike-project + run: | cp ../examples/typescript.ts index.ts + + + - name: Compile the project in typescript + working-directory: my-aerospike-project + run: | npx tsc index.ts + + - name: Run the compile javascript test + working-directory: my-aerospike-project + run: | node index.js \ No newline at end of file From 6438af73233683374fbe3da4924833ebdf045a15 Mon Sep 17 00:00:00 2001 From: Dominic Pelini <111786059+DomPeliniAerospike@users.noreply.github.com> Date: Wed, 21 Feb 2024 14:34:30 -0700 Subject: [PATCH 14/30] Fixed syntax errors --- .github/workflows/build-bindings.yml | 1 + .github/workflows/tests.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/.github/workflows/build-bindings.yml b/.github/workflows/build-bindings.yml index 7a8f1cb1f..09dcc9e09 100644 --- a/.github/workflows/build-bindings.yml +++ b/.github/workflows/build-bindings.yml @@ -608,6 +608,7 @@ jobs: json -I -f package.json -e "this.scripts.install=\"npm-run-all removeExtraBinaries build\"" - name: Make package directory + run: | mkdir my-aerospike-project - name: Initialize npm project diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 58c3ae264..5a120a86e 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -378,6 +378,7 @@ jobs: run: docker run -d --name aerospike -p 3000-3002:3000-3002 aerospike/aerospike-server - name: Make package directory + run: | mkdir my-aerospike-project - name: Initialize npm project From 6c0c42ab06c0b90b8126250807d082470d580134 Mon Sep 17 00:00:00 2001 From: Dominic Pelini <111786059+DomPeliniAerospike@users.noreply.github.com> Date: Wed, 21 Feb 2024 14:45:22 -0700 Subject: [PATCH 15/30] Update build-bindings.yml --- .github/workflows/build-bindings.yml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/.github/workflows/build-bindings.yml b/.github/workflows/build-bindings.yml index 09dcc9e09..cc5d73c59 100644 --- a/.github/workflows/build-bindings.yml +++ b/.github/workflows/build-bindings.yml @@ -160,6 +160,22 @@ jobs: shell: /bin/bash # Set an output parameter `uname` for use in subsequent steps run: | + + # Add Docker's official GPG key: + apt-get update + apt-get install ca-certificates curl + install -m 0755 -d /etc/apt/keyrings + curl -fsSL https://download.docker.com/linux/ubuntu/gpg -o /etc/apt/keyrings/docker.asc + chmod a+r /etc/apt/keyrings/docker.asc + + # Add the repository to Apt sources: + echo \ + "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.asc] https://download.docker.com/linux/ubuntu \ + $(. /etc/os-release && echo "$VERSION_CODENAME") stable" | \ + tee /etc/apt/sources.list.d/docker.list > /dev/null + apt-get update + apt-get install docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin + docker run hello-world docker run -d --name aerospike -p 3000-3002:3000-3002 aerospike/aerospike-server apt update apt install -y g++ libssl-dev zlib1g-dev make build-essential libuv1-dev wget curl python3 From 0f1979fab5ff5ffe22e5a9d79cf767552b960271 Mon Sep 17 00:00:00 2001 From: Dominic Pelini <111786059+DomPeliniAerospike@users.noreply.github.com> Date: Wed, 21 Feb 2024 14:50:15 -0700 Subject: [PATCH 16/30] Added -y flag to auto confirm install --- .github/workflows/build-bindings.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-bindings.yml b/.github/workflows/build-bindings.yml index cc5d73c59..4685cc8a3 100644 --- a/.github/workflows/build-bindings.yml +++ b/.github/workflows/build-bindings.yml @@ -163,7 +163,7 @@ jobs: # Add Docker's official GPG key: apt-get update - apt-get install ca-certificates curl + apt-get install ca-certificates curl -y install -m 0755 -d /etc/apt/keyrings curl -fsSL https://download.docker.com/linux/ubuntu/gpg -o /etc/apt/keyrings/docker.asc chmod a+r /etc/apt/keyrings/docker.asc @@ -174,7 +174,7 @@ jobs: $(. /etc/os-release && echo "$VERSION_CODENAME") stable" | \ tee /etc/apt/sources.list.d/docker.list > /dev/null apt-get update - apt-get install docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin + apt-get install docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin -y docker run hello-world docker run -d --name aerospike -p 3000-3002:3000-3002 aerospike/aerospike-server apt update From b516a84f285fa064b1c513ff8edc0910d5c14d76 Mon Sep 17 00:00:00 2001 From: Dominic Pelini <111786059+DomPeliniAerospike@users.noreply.github.com> Date: Wed, 21 Feb 2024 14:58:20 -0700 Subject: [PATCH 17/30] Update build-bindings.yml --- .github/workflows/build-bindings.yml | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build-bindings.yml b/.github/workflows/build-bindings.yml index 4685cc8a3..d1dcd60e2 100644 --- a/.github/workflows/build-bindings.yml +++ b/.github/workflows/build-bindings.yml @@ -134,15 +134,6 @@ jobs: username: ${{ secrets.DOCKER_HUB_BOT_USERNAME }} password: ${{ secrets.DOCKER_HUB_BOT_PW }} - - - name: Run Aerospike server release candidate with latest tag - if: ${{ contains(github.event.pull_request.labels.*.name, 'new-server-features') }} - run: docker run -d --name aerospike -p 3000-3002:3000-3002 aerospike/aerospike-server-rc:latest - - - name: Run Aerospike server - if: ${{ !contains(github.event.pull_request.labels.*.name, 'new-server-features') }} - run: docker run -d --name aerospike -p 3000-3002:3000-3002 aerospike/aerospike-server - - name: Enable tests run: echo "TEST_COMMAND=npm test -- --h 127.0.0.1 --port 3000" >> $GITHUB_ENV @@ -203,6 +194,14 @@ jobs: env: CFLAGS: '-Werror' + - name: Run Aerospike server release candidate with latest tag + if: ${{ contains(github.event.pull_request.labels.*.name, 'new-server-features') }} + run: docker run -d --name aerospike -p 3000-3002:3000-3002 aerospike/aerospike-server-rc:latest + + - name: Run Aerospike server + if: ${{ !contains(github.event.pull_request.labels.*.name, 'new-server-features') }} + run: docker run -d --name aerospike -p 3000-3002:3000-3002 aerospike/aerospike-server + - name: Test client if: ${{ matrix.platform != 'aarch64' }} run: | From 402a76f2afe4f5cb56cdeb570198c7e19afe3b4d Mon Sep 17 00:00:00 2001 From: Dominic Pelini <111786059+DomPeliniAerospike@users.noreply.github.com> Date: Mon, 26 Feb 2024 06:39:03 -0700 Subject: [PATCH 18/30] added arm64 pipeline --- .github/workflows/build-bindings.yml | 298 +++++++++++++-------------- 1 file changed, 149 insertions(+), 149 deletions(-) diff --git a/.github/workflows/build-bindings.yml b/.github/workflows/build-bindings.yml index d1dcd60e2..15768a143 100644 --- a/.github/workflows/build-bindings.yml +++ b/.github/workflows/build-bindings.yml @@ -248,35 +248,35 @@ jobs: node-version: ${{ matrix.nodejs[1] }} architecture: 'x64' -# - name: Install Docker Engine -# run: brew install colima -# -# - name: Install Docker client -# run: brew install docker -# -# - name: Start Docker Engine -# run: colima start -# -# - if: ${{ contains(github.event.pull_request.labels.*.name, 'new-server-features') }} -# uses: docker/login-action@v3 -# with: -# username: ${{ secrets.DOCKER_HUB_BOT_USERNAME }} -# password: ${{ secrets.DOCKER_HUB_BOT_PW }} -# -# - name: Run Aerospike server release candidate with latest tag -# if: ${{ contains(github.event.pull_request.labels.*.name, 'new-server-features') }} -# run: docker run -d --name aerospike -p 3000-3002:3000-3002 aerospike/aerospike-server-rc:latest -# -# - name: Run Aerospike server -# if: ${{ !contains(github.event.pull_request.labels.*.name, 'new-server-features') }} -# run: docker run -d --name aerospike -p 3000-3002:3000-3002 aerospike/aerospike-server -# -# - name: Enable tests -# run: echo "TEST_COMMAND=npm test -- --h 127.0.0.1 --port 3000 --t 30000" >> $GITHUB_ENV + - name: Install Docker Engine + run: brew install colima -# - name: Disable tests (only run basic import test) -# if: ${{ !inputs.run_tests }} -# run: echo "TEST_COMMAND=node -e 'aerospike = require(\".\/lib\/aerospike\")'" >> $GITHUB_ENV + - name: Install Docker client + run: brew install docker + + - name: Start Docker Engine + run: colima start + + - if: ${{ contains(github.event.pull_request.labels.*.name, 'new-server-features') }} + uses: docker/login-action@v3 + with: + username: ${{ secrets.DOCKER_HUB_BOT_USERNAME }} + password: ${{ secrets.DOCKER_HUB_BOT_PW }} + + - name: Run Aerospike server release candidate with latest tag + if: ${{ contains(github.event.pull_request.labels.*.name, 'new-server-features') }} + run: docker run -d --name aerospike -p 3000-3002:3000-3002 aerospike/aerospike-server-rc:latest + + - name: Run Aerospike server + if: ${{ !contains(github.event.pull_request.labels.*.name, 'new-server-features') }} + run: docker run -d --name aerospike -p 3000-3002:3000-3002 aerospike/aerospike-server + + - name: Enable tests + run: echo "TEST_COMMAND=npm test -- --h 127.0.0.1 --port 3000 --t 30000" >> $GITHUB_ENV + + - name: Disable tests (only run basic import test) + if: ${{ !inputs.run_tests }} + run: echo "TEST_COMMAND=node -e 'aerospike = require(\".\/lib\/aerospike\")'" >> $GITHUB_ENV - name: Build client run: | @@ -303,127 +303,127 @@ jobs: sha: ${{ github.sha }} context: "Build bindings (${{ matrix.nodejs[0] }}-macosx_x86_64)" -# macOS-m1: -# runs-on: [ -# self-hosted, -# macOS, -# ARM64 -# ] -# strategy: -# matrix: -# nodejs-version: [ -# ["v108", "18"], -# ["v115", "20"], -# ["v120", "21"], -# ] -# fail-fast: false -# steps: -# - name: Show job status for commit -# uses: myrotvorets/set-commit-status-action@v2.0.0 -# with: -# sha: ${{ github.sha }} -# context: "Build bindings (${{ matrix.nodejs-version[1] }}-macosx_arm64)" -# -# - uses: actions/checkout@v4 -# with: -# submodules: recursive -# ref: ${{ inputs.commit_sha }} -# -# - name: Install NVM -# run: | -# curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.7/install.sh | bash -# source ~/.zshrc -# nvm -v -# nvm install ${{ matrix.nodejs-version[1] }} -# -# -# - name: Setup symlink folders -# run: | -# sudo rm -rf /usr/local/opt/openssl; -# sudo rm -rf /usr/local/opt/libuv; -# sudo mkdir -p /usr/local/opt; -# sudo chown -R $(whoami) /usr/local/opt -# -# - name: Install brew packages -# run: | -# brew install openssl@3.2.1 -# brew install libuv@1.47.0 -# -# - name: Set environment for building -# run: | -# echo "export PATH="/usr/local/bin/:/usr/local/opt/openssl/bin:$PATH" -# export LDFLAGS="-L/usr/local/opt/openssl/lib" -# export CPPFLAGS="-I/usr/local/opt/openssl/include" -# export EXT_CFLAGS="-I/usr/local/opt/openssl/include"" >> ~/.zshrc; -# source ~/.zshrc; -# -# - name: Setup symlink folders -# run: | -# sudo ln -s /usr/local/Cellar/libuv/1.47.0/ /usr/local/opt/libuv; -# sudo ln -s /usr/local/Cellar/openssl@3/3.2.1/ /usr/local/opt/openssl; -# -# # Self-hosted runner only -# # Need to be able to save Docker Hub credentials to keychain -# - run: security unlock-keychain -p ${{ secrets.MAC_M1_SELF_HOSTED_RUNNER_PW }} -# if: ${{ inputs.run_tests && inputs.use-server-rc }} -# -# - if: ${{ inputs.run_tests && inputs.use-server-rc }} -# uses: docker/login-action@v3 -# with: -# username: ${{ secrets.DOCKER_HUB_BOT_USERNAME }} -# password: ${{ secrets.DOCKER_HUB_BOT_PW }} -# -# - name: Use server rc -# if: ${{ inputs.run_tests && inputs.use-server-rc }} -# run: echo IMAGE_NAME="${{ vars.SERVER_RC_REPO_LINK }}:${{ inputs.server-tag }}" >> $GITHUB_ENV -# -# - name: Use server release -# if: ${{ inputs.run_tests && !inputs.use-server-rc }} -# run: echo IMAGE_NAME="${{ vars.SERVER_REPO_LINK }}:${{ inputs.server-tag }}" >> $GITHUB_ENV -# -# - name: Run server -# if: ${{ inputs.run_tests }} -# run: docker run -d -p 3000:3000 --name aerospike ${{ env.IMAGE_NAME }} -# -# - name: Build client -# run: | -# ./scripts/build-c-client.sh -# npm install -# env: -# CFLAGS: '-Werror' -# -# - name: Enable tests -# if: ${{ inputs.run_tests }} -# run: echo "TEST_COMMAND=npm test -- --h 127.0.0.1 --port 3000" >> $GITHUB_ENV -# -# - name: Disable tests (only run basic import test) -# if: ${{ !inputs.run_tests }} -# run: echo "TEST_COMMAND=node -e 'aerospike = require(\".\/lib\/aerospike\")'" >> $GITHUB_ENV -# -# -# - name: Test client -# run: | -# ${{ env.TEST_COMMAND }} -# -# - name: Save macOS wheel -# uses: actions/upload-artifact@v4 -# with: -# name: ${{ matrix.nodejs-version[0] }}-macosx_arm64.build -# path: ./lib/binding/*/ -# -# - name: Stop server -# if: ${{ always() && inputs.run_tests }} -# run: | -# docker container stop aerospike -# docker container prune -f -# -# - name: Set final commit status -# uses: myrotvorets/set-commit-status-action@v2.0.0 -# if: always() -# with: -# sha: ${{ github.sha }} -# status: ${{ job.status }} -# context: "Build bindings (${{ matrix.nodejs-version[0] }}-macosx_arm64)" + macOS-m1: + runs-on: [ + self-hosted, + macOS, + ARM64 + ] + strategy: + matrix: + nodejs-version: [ + ["v108", "18"], + ["v115", "20"], + ["v120", "21"], + ] + fail-fast: false + steps: + - name: Show job status for commit + uses: myrotvorets/set-commit-status-action@v2.0.0 + with: + sha: ${{ github.sha }} + context: "Build bindings (${{ matrix.nodejs-version[1] }}-macosx_arm64)" + + - uses: actions/checkout@v4 + with: + submodules: recursive + ref: ${{ inputs.commit_sha }} + + - name: Install NVM + run: | + curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.7/install.sh | bash + source ~/.zshrc + nvm -v + nvm install ${{ matrix.nodejs-version[1] }} + + + - name: Setup symlink folders + run: | + sudo rm -rf /usr/local/opt/openssl; + sudo rm -rf /usr/local/opt/libuv; + sudo mkdir -p /usr/local/opt; + sudo chown -R $(whoami) /usr/local/opt + + - name: Install brew packages + run: | + brew install openssl@3.2.1 + brew install libuv@1.47.0 + + - name: Set environment for building + run: | + echo "export PATH="/usr/local/bin/:/usr/local/opt/openssl/bin:$PATH" + export LDFLAGS="-L/usr/local/opt/openssl/lib" + export CPPFLAGS="-I/usr/local/opt/openssl/include" + export EXT_CFLAGS="-I/usr/local/opt/openssl/include"" >> ~/.zshrc; + source ~/.zshrc; + + - name: Setup symlink folders + run: | + sudo ln -s /usr/local/Cellar/libuv/1.47.0/ /usr/local/opt/libuv; + sudo ln -s /usr/local/Cellar/openssl@3/3.2.1/ /usr/local/opt/openssl; + + # Self-hosted runner only + # Need to be able to save Docker Hub credentials to keychain + - run: security unlock-keychain -p ${{ secrets.MAC_M1_SELF_HOSTED_RUNNER_PW }} + if: ${{ inputs.run_tests && inputs.use-server-rc }} + + - if: ${{ inputs.run_tests && inputs.use-server-rc }} + uses: docker/login-action@v3 + with: + username: ${{ secrets.DOCKER_HUB_BOT_USERNAME }} + password: ${{ secrets.DOCKER_HUB_BOT_PW }} + + - name: Use server rc + if: ${{ inputs.run_tests && inputs.use-server-rc }} + run: echo IMAGE_NAME="${{ vars.SERVER_RC_REPO_LINK }}:${{ inputs.server-tag }}" >> $GITHUB_ENV + + - name: Use server release + if: ${{ inputs.run_tests && !inputs.use-server-rc }} + run: echo IMAGE_NAME="${{ vars.SERVER_REPO_LINK }}:${{ inputs.server-tag }}" >> $GITHUB_ENV + + - name: Run server + if: ${{ inputs.run_tests }} + run: docker run -d -p 3000:3000 --name aerospike ${{ env.IMAGE_NAME }} + + - name: Build client + run: | + ./scripts/build-c-client.sh + npm install + env: + CFLAGS: '-Werror' + + - name: Enable tests + if: ${{ inputs.run_tests }} + run: echo "TEST_COMMAND=npm test -- --h 127.0.0.1 --port 3000" >> $GITHUB_ENV + + - name: Disable tests (only run basic import test) + if: ${{ !inputs.run_tests }} + run: echo "TEST_COMMAND=node -e 'aerospike = require(\".\/lib\/aerospike\")'" >> $GITHUB_ENV + + + - name: Test client + run: | + ${{ env.TEST_COMMAND }} + + - name: Save macOS wheel + uses: actions/upload-artifact@v4 + with: + name: ${{ matrix.nodejs-version[0] }}-macosx_arm64.build + path: ./lib/binding/*/ + + - name: Stop server + if: ${{ always() && inputs.run_tests }} + run: | + docker container stop aerospike + docker container prune -f + + - name: Set final commit status + uses: myrotvorets/set-commit-status-action@v2.0.0 + if: always() + with: + sha: ${{ github.sha }} + status: ${{ job.status }} + context: "Build bindings (${{ matrix.nodejs-version[0] }}-macosx_arm64)" test-npm-install: runs-on: ubuntu-latest From faf77f6aa4996134ec0172546056b9e1fb51cbd1 Mon Sep 17 00:00:00 2001 From: Dominic Pelini <111786059+DomPeliniAerospike@users.noreply.github.com> Date: Mon, 26 Feb 2024 07:03:54 -0700 Subject: [PATCH 19/30] Update build-bindings.yml --- .github/workflows/build-bindings.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-bindings.yml b/.github/workflows/build-bindings.yml index 15768a143..88a11e278 100644 --- a/.github/workflows/build-bindings.yml +++ b/.github/workflows/build-bindings.yml @@ -349,7 +349,7 @@ jobs: brew install openssl@3.2.1 brew install libuv@1.47.0 - - name: Set environment for building + - name: Set environment for building run: | echo "export PATH="/usr/local/bin/:/usr/local/opt/openssl/bin:$PATH" export LDFLAGS="-L/usr/local/opt/openssl/lib" From 01dd359532e92916e4a1d25907d0f23857ab9c7e Mon Sep 17 00:00:00 2001 From: Dominic Pelini <111786059+DomPeliniAerospike@users.noreply.github.com> Date: Mon, 26 Feb 2024 07:11:11 -0700 Subject: [PATCH 20/30] Update build-bindings.yml --- .github/workflows/build-bindings.yml | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build-bindings.yml b/.github/workflows/build-bindings.yml index 88a11e278..2c8e7ac47 100644 --- a/.github/workflows/build-bindings.yml +++ b/.github/workflows/build-bindings.yml @@ -180,7 +180,17 @@ jobs: ls nvm i 20 npm install - ${{ env.TEST_COMMAND }} +# ${{ env.TEST_COMMAND }} + + + + - name: Run Aerospike server release candidate with latest tag + if: ${{ contains(github.event.pull_request.labels.*.name, 'new-server-features') }} + run: docker run -d --name aerospike -p 3000-3002:3000-3002 aerospike/aerospike-server-rc:latest + + - name: Run Aerospike server + if: ${{ !contains(github.event.pull_request.labels.*.name, 'new-server-features') }} + run: docker run -d --name aerospike -p 3000-3002:3000-3002 aerospike/aerospike-server - name: Build client x64 if: ${{ matrix.platform != 'aarch64' }} @@ -193,15 +203,7 @@ jobs: npm install env: CFLAGS: '-Werror' - - - name: Run Aerospike server release candidate with latest tag - if: ${{ contains(github.event.pull_request.labels.*.name, 'new-server-features') }} - run: docker run -d --name aerospike -p 3000-3002:3000-3002 aerospike/aerospike-server-rc:latest - - - name: Run Aerospike server - if: ${{ !contains(github.event.pull_request.labels.*.name, 'new-server-features') }} - run: docker run -d --name aerospike -p 3000-3002:3000-3002 aerospike/aerospike-server - + - name: Test client if: ${{ matrix.platform != 'aarch64' }} run: | @@ -332,6 +334,7 @@ jobs: - name: Install NVM run: | curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.7/install.sh | bash + touch ~/.zshrc source ~/.zshrc nvm -v nvm install ${{ matrix.nodejs-version[1] }} From 14c3092aa3f8f5082ff60e4899fec91f2ab03ef4 Mon Sep 17 00:00:00 2001 From: Dominic Pelini <111786059+DomPeliniAerospike@users.noreply.github.com> Date: Mon, 26 Feb 2024 07:59:30 -0700 Subject: [PATCH 21/30] Update build-bindings.yml --- .github/workflows/build-bindings.yml | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build-bindings.yml b/.github/workflows/build-bindings.yml index 2c8e7ac47..3443deac3 100644 --- a/.github/workflows/build-bindings.yml +++ b/.github/workflows/build-bindings.yml @@ -182,14 +182,8 @@ jobs: npm install # ${{ env.TEST_COMMAND }} - - - - name: Run Aerospike server release candidate with latest tag - if: ${{ contains(github.event.pull_request.labels.*.name, 'new-server-features') }} - run: docker run -d --name aerospike -p 3000-3002:3000-3002 aerospike/aerospike-server-rc:latest - - name: Run Aerospike server - if: ${{ !contains(github.event.pull_request.labels.*.name, 'new-server-features') }} + if: ${{ matrix.platform != 'aarch64' }} run: docker run -d --name aerospike -p 3000-3002:3000-3002 aerospike/aerospike-server - name: Build client x64 @@ -203,7 +197,7 @@ jobs: npm install env: CFLAGS: '-Werror' - + - name: Test client if: ${{ matrix.platform != 'aarch64' }} run: | From 5b6f450ae8bf54a66be4577d56df241712a8c112 Mon Sep 17 00:00:00 2001 From: Dominic Pelini <111786059+DomPeliniAerospike@users.noreply.github.com> Date: Mon, 26 Feb 2024 08:02:44 -0700 Subject: [PATCH 22/30] Update build-bindings.yml --- .github/workflows/build-bindings.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build-bindings.yml b/.github/workflows/build-bindings.yml index 3443deac3..3d7806c78 100644 --- a/.github/workflows/build-bindings.yml +++ b/.github/workflows/build-bindings.yml @@ -182,6 +182,7 @@ jobs: npm install # ${{ env.TEST_COMMAND }} + - name: Run Aerospike server if: ${{ matrix.platform != 'aarch64' }} run: docker run -d --name aerospike -p 3000-3002:3000-3002 aerospike/aerospike-server From 2a828e3c8111deed856864b0313594046ae15d4d Mon Sep 17 00:00:00 2001 From: Dominic Pelini <111786059+DomPeliniAerospike@users.noreply.github.com> Date: Mon, 26 Feb 2024 08:14:33 -0700 Subject: [PATCH 23/30] Update build-bindings.yml --- .github/workflows/build-bindings.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/build-bindings.yml b/.github/workflows/build-bindings.yml index 3d7806c78..3443deac3 100644 --- a/.github/workflows/build-bindings.yml +++ b/.github/workflows/build-bindings.yml @@ -182,7 +182,6 @@ jobs: npm install # ${{ env.TEST_COMMAND }} - - name: Run Aerospike server if: ${{ matrix.platform != 'aarch64' }} run: docker run -d --name aerospike -p 3000-3002:3000-3002 aerospike/aerospike-server From b258e01e60702feaca199aeef5ccedfd99caa33a Mon Sep 17 00:00:00 2001 From: Dominic Pelini <111786059+DomPeliniAerospike@users.noreply.github.com> Date: Mon, 26 Feb 2024 08:25:04 -0700 Subject: [PATCH 24/30] Update build-bindings.yml --- .github/workflows/build-bindings.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-bindings.yml b/.github/workflows/build-bindings.yml index 3443deac3..89fce61f7 100644 --- a/.github/workflows/build-bindings.yml +++ b/.github/workflows/build-bindings.yml @@ -343,7 +343,7 @@ jobs: - name: Install brew packages run: | - brew install openssl@3.2.1 + brew install openssl@3.0 brew install libuv@1.47.0 - name: Set environment for building @@ -357,7 +357,7 @@ jobs: - name: Setup symlink folders run: | sudo ln -s /usr/local/Cellar/libuv/1.47.0/ /usr/local/opt/libuv; - sudo ln -s /usr/local/Cellar/openssl@3/3.2.1/ /usr/local/opt/openssl; + sudo ln -s /usr/local/Cellar/openssl@3/3.0.13/ /usr/local/opt/openssl; # Self-hosted runner only # Need to be able to save Docker Hub credentials to keychain From b26b42822d160fcab97db14c48deb205540c5ca1 Mon Sep 17 00:00:00 2001 From: Dominic Pelini <111786059+DomPeliniAerospike@users.noreply.github.com> Date: Mon, 26 Feb 2024 08:27:38 -0700 Subject: [PATCH 25/30] Update build-bindings.yml --- .github/workflows/build-bindings.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-bindings.yml b/.github/workflows/build-bindings.yml index 89fce61f7..3d485c4d4 100644 --- a/.github/workflows/build-bindings.yml +++ b/.github/workflows/build-bindings.yml @@ -344,7 +344,7 @@ jobs: - name: Install brew packages run: | brew install openssl@3.0 - brew install libuv@1.47.0 + brew install libuv - name: Set environment for building run: | @@ -356,7 +356,7 @@ jobs: - name: Setup symlink folders run: | - sudo ln -s /usr/local/Cellar/libuv/1.47.0/ /usr/local/opt/libuv; + sudo ln -s /usr/local/Cellar/libuv/1.48.0/ /usr/local/opt/libuv; sudo ln -s /usr/local/Cellar/openssl@3/3.0.13/ /usr/local/opt/openssl; # Self-hosted runner only From 520c7677496527d7bba4d208e17a85312611d2a8 Mon Sep 17 00:00:00 2001 From: Dominic Pelini <111786059+DomPeliniAerospike@users.noreply.github.com> Date: Mon, 26 Feb 2024 08:36:17 -0700 Subject: [PATCH 26/30] Update build-bindings.yml --- .github/workflows/build-bindings.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-bindings.yml b/.github/workflows/build-bindings.yml index 3d485c4d4..94c71f7d9 100644 --- a/.github/workflows/build-bindings.yml +++ b/.github/workflows/build-bindings.yml @@ -356,8 +356,8 @@ jobs: - name: Setup symlink folders run: | - sudo ln -s /usr/local/Cellar/libuv/1.48.0/ /usr/local/opt/libuv; - sudo ln -s /usr/local/Cellar/openssl@3/3.0.13/ /usr/local/opt/openssl; + sudo ln -s /usr/local/Cellar/libuv/ /usr/local/opt/libuv; + sudo ln -s /usr/local/Cellar/openssl@3/ /usr/local/opt/openssl; # Self-hosted runner only # Need to be able to save Docker Hub credentials to keychain From f8f2d78f38484827e95fa53cf066134bf5cd15c5 Mon Sep 17 00:00:00 2001 From: Dominic Pelini <111786059+DomPeliniAerospike@users.noreply.github.com> Date: Mon, 26 Feb 2024 08:56:41 -0700 Subject: [PATCH 27/30] Update build-bindings.yml --- .github/workflows/build-bindings.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-bindings.yml b/.github/workflows/build-bindings.yml index 94c71f7d9..07d02d5ed 100644 --- a/.github/workflows/build-bindings.yml +++ b/.github/workflows/build-bindings.yml @@ -356,8 +356,8 @@ jobs: - name: Setup symlink folders run: | - sudo ln -s /usr/local/Cellar/libuv/ /usr/local/opt/libuv; - sudo ln -s /usr/local/Cellar/openssl@3/ /usr/local/opt/openssl; + sudo ln -s /opt/homebrew/opt/libuv/ /usr/local/opt/libuv; + sudo ln -s /opt/homebrew/opt/openssl@3/ /usr/local/opt/openssl; # Self-hosted runner only # Need to be able to save Docker Hub credentials to keychain From 6282926e1d1af547eacdb43808479c7b112aa389 Mon Sep 17 00:00:00 2001 From: Dominic Pelini <111786059+DomPeliniAerospike@users.noreply.github.com> Date: Mon, 26 Feb 2024 09:21:23 -0700 Subject: [PATCH 28/30] Update build-bindings.yml --- .github/workflows/build-bindings.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-bindings.yml b/.github/workflows/build-bindings.yml index 07d02d5ed..a55a6c6d5 100644 --- a/.github/workflows/build-bindings.yml +++ b/.github/workflows/build-bindings.yml @@ -343,8 +343,10 @@ jobs: - name: Install brew packages run: | - brew install openssl@3.0 - brew install libuv + brew install libuv; + sudo ln -s /opt/homebrew/opt/libuv/ /usr/local/opt/libuv; + brew install openssl; + sudo ln -s /opt/homebrew/opt/openssl@3/ /usr/local/opt/openssl; - name: Set environment for building run: | From 3a887b9b27e30326c95af55df605c6704b741ac7 Mon Sep 17 00:00:00 2001 From: Dominic Pelini <111786059+DomPeliniAerospike@users.noreply.github.com> Date: Mon, 26 Feb 2024 09:27:42 -0700 Subject: [PATCH 29/30] Update build-bindings.yml --- .github/workflows/build-bindings.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-bindings.yml b/.github/workflows/build-bindings.yml index a55a6c6d5..266dc3204 100644 --- a/.github/workflows/build-bindings.yml +++ b/.github/workflows/build-bindings.yml @@ -392,12 +392,11 @@ jobs: CFLAGS: '-Werror' - name: Enable tests - if: ${{ inputs.run_tests }} run: echo "TEST_COMMAND=npm test -- --h 127.0.0.1 --port 3000" >> $GITHUB_ENV - - name: Disable tests (only run basic import test) - if: ${{ !inputs.run_tests }} - run: echo "TEST_COMMAND=node -e 'aerospike = require(\".\/lib\/aerospike\")'" >> $GITHUB_ENV +# - name: Disable tests (only run basic import test) +# if: ${{ !inputs.run_tests }} +# run: echo "TEST_COMMAND=node -e 'aerospike = require(\".\/lib\/aerospike\")'" >> $GITHUB_ENV - name: Test client From 54f7fa77d4c313d441612c927800c093496b2f43 Mon Sep 17 00:00:00 2001 From: Dominic Pelini <111786059+DomPeliniAerospike@users.noreply.github.com> Date: Mon, 26 Feb 2024 09:38:15 -0700 Subject: [PATCH 30/30] Update build-bindings.yml --- .github/workflows/build-bindings.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.github/workflows/build-bindings.yml b/.github/workflows/build-bindings.yml index 266dc3204..a0be123ef 100644 --- a/.github/workflows/build-bindings.yml +++ b/.github/workflows/build-bindings.yml @@ -356,11 +356,6 @@ jobs: export EXT_CFLAGS="-I/usr/local/opt/openssl/include"" >> ~/.zshrc; source ~/.zshrc; - - name: Setup symlink folders - run: | - sudo ln -s /opt/homebrew/opt/libuv/ /usr/local/opt/libuv; - sudo ln -s /opt/homebrew/opt/openssl@3/ /usr/local/opt/openssl; - # Self-hosted runner only # Need to be able to save Docker Hub credentials to keychain - run: security unlock-keychain -p ${{ secrets.MAC_M1_SELF_HOSTED_RUNNER_PW }}