Skip to content

Commit 3d86114

Browse files
DomPeliniAerospikeDomPeliniAerospike
authored
Merge pull request #680 from aerospike/stage
Nodejs-Client-Release-6.2.0
2 parents 87d402e + 4d2fb85 commit 3d86114

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+3049
-1508
lines changed

‎.github/workflows/build-bindings.yml‎

Lines changed: 59 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -116,11 +116,11 @@ jobs:
116116
run: |
117117
declare -A hashmap
118118
hashmap[manylinux_x86_64]="ubuntu-22.04"
119-
hashmap[manylinux_aarch64]="22.04A"
120-
hashmap[manylinux_20_x86_64]="20.04"
121-
hashmap[manylinux_20_aarch64]="20.04A"
119+
hashmap[manylinux_aarch64]="ubuntu-22.04-arm"
120+
hashmap[manylinux_20_x86_64]="ubuntu-20.04"
121+
hashmap[manylinux_20_aarch64]="ubuntu-22.04"
122122
hashmap[macosx_x86_64]="macos-13-large"
123-
hashmap[macosx_arm64]="SMA"
123+
hashmap[macosx_arm64]="SMA2"
124124
hashmap[win_amd64]="windows-2022"
125125
echo runner_os=${hashmap[${{ inputs.platform-tag }}]} >> $GITHUB_OUTPUT
126126
# Bash >= 4 supports hashmaps
@@ -223,8 +223,16 @@ jobs:
223223
# npm run test dist/ -- --h 127.0.0.1 --port 3000" >> $GITHUB_ENV
224224
# shell: bash
225225

226+
- name: upgrade to gcc++ 10
227+
if: ${{ inputs.platform-tag == 'manylinux_20_x86_64' || inputs.platform-tag == 'manylinux_20_aarch64' }}
228+
run:
229+
sudo apt install g++-10;
230+
sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-9 40;
231+
sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-10 60;
232+
sudo update-alternatives --set g++ /usr/bin/g++-10;
226233

227234
- name: Build Binding
235+
if: ${{ inputs.platform-tag != 'manylinux_20_aarch64'}}
228236
run: |
229237
./scripts/build-c-client.sh;
230238
npm install;
@@ -234,9 +242,9 @@ jobs:
234242
# run: |
235243
# docker ps;
236244
# docker logs aerospike;
237-
245+
238246
- name: Run tests
239-
if: ${{ inputs.run_tests && inputs.platform-tag == 'manylinux_x86_64'}}
247+
if: ${{ inputs.run_tests && inputs.platform-tag != 'manylinux_20_aarch64'}}
240248
run: |
241249
cd ts-test;
242250
npm install;
@@ -245,6 +253,50 @@ jobs:
245253
npx tsc;
246254
npm run test dist/${{ inputs.test-file }} -- --h 172.17.0.2 --port 3000 --U superuser --P superuser;
247255
256+
- name: Set up QEMU for cross compiling arm64
257+
if: ${{ inputs.platform-tag == 'manylinux_20_aarch64'}}
258+
uses: docker/setup-qemu-action@v2
259+
with:
260+
platforms: arm64
261+
262+
- name: Run distro container
263+
if: ${{ inputs.platform-tag == 'manylinux_20_aarch64'}}
264+
run: docker run --name bullseye --platform linux/arm64 --network host --detach node:${{ matrix.nodejs-tag[1] }}-bullseye tail -f /dev/null
265+
266+
- name: Copy repo to container
267+
if: ${{ inputs.platform-tag == 'manylinux_20_aarch64'}}
268+
run: docker cp . bullseye:/aerospike-client-nodejs
269+
270+
- name: Make sure npm is installed
271+
if: ${{ inputs.platform-tag == 'manylinux_20_aarch64'}}
272+
run: docker exec bullseye node -v && docker exec bullseye npm -v
273+
274+
- name: build c client
275+
if: ${{ inputs.platform-tag == 'manylinux_20_aarch64'}}
276+
run: docker exec --workdir /aerospike-client-nodejs/ bullseye ./scripts/build-c-client.sh;
277+
278+
- name: build binding
279+
if: ${{ inputs.platform-tag == 'manylinux_20_aarch64'}}
280+
run:
281+
docker exec --workdir /aerospike-client-nodejs/ bullseye npm install;
282+
docker exec --workdir /aerospike-client-nodejs/ bullseye ls lib/binding;
283+
284+
- name: Run tests
285+
id: test
286+
if: ${{ inputs.run_tests && inputs.platform-tag == 'manylinux_20_aarch64'}}
287+
run: |
288+
docker exec --workdir /aerospike-client-nodejs/ts-test bullseye npm install
289+
docker exec --workdir /aerospike-client-nodejs/ts-test bullseye npx tsc
290+
docker exec --workdir /aerospike-client-nodejs bullseye npx tsc
291+
docker exec --workdir /aerospike-client-nodejs bullseye npm run test dist/${{ inputs.test-file }} -- --h 172.17.0.2 --port 3000 --U superuser --P superuser
292+
293+
- name: Copy repo to container
294+
if: ${{ inputs.platform-tag == 'manylinux_20_aarch64'}}
295+
run:
296+
docker cp bullseye:/aerospike-client-nodejs/lib/binding ./lib/binding;
297+
ls lib/binding;
298+
299+
248300
#- name: Run tests
249301
# if: ${{ inputs.run_tests && inputs.platform-tag == 'macosx_x86_64'}}
250302
# run: |
@@ -257,7 +309,6 @@ jobs:
257309
# npx tsc;
258310
# npm run test dist/${{ inputs.test-file }} -- --h localhost --port 3000 --t 15000 --U superuser --P superuser;
259311

260-
261312
- name: Upload wheels to GitHub Linux x86
262313
uses: actions/upload-artifact@v4
263314
if: ${{ inputs.platform-tag == 'manylinux_x86_64' }}
@@ -333,7 +384,7 @@ jobs:
333384
# fail-fast: false
334385
# matrix:
335386
# nodejs-tag: ${{ fromJSON(inputs.nodejs-tags) }}
336-
# runs-on: ${{ inputs.platform-tag == 'macosx_arm64' && fromJSON('["self-hosted", "macOS", "ARM64", "SMA"]') || fromJSON('["self-hosted", "Windows", "X64"]') }}
387+
# runs-on: ${{ inputs.platform-tag == 'macosx_arm64' && fromJSON('["self-hosted", "macOS", "ARM64", "SMA2"]') || fromJSON('["self-hosted", "Windows", "X64"]') }}
337388
# env:
338389
# BUILD_IDENTIFIER: "${{ matrix.nodejs-tag[0] }}-${{ inputs.platform-tag }}"
339390
# steps:

‎.github/workflows/dev-workflow-p1.yml‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
# test-with-server-release:
3131
# uses: ./.github/workflows/build-artifacts.yml
3232
# with:
33-
# run_tests: true
33+
# run_tests: false
3434
# secrets: inherit
3535
#
3636
## bump-dev-number:
@@ -51,18 +51,11 @@
5151
# ]
5252
# uses: ./.github/workflows/upload-to-jfrog.yml
5353
# with:
54-
# version: 6.1.0-dev.6
54+
# version: 6.2.0-dev.14
5555
# secrets: inherit
5656
#
5757
# # We don't want the artifacts in JFrog to also exist in Github
5858
# delete-artifacts:
5959
# needs: upload-to-jfrog
6060
# uses: ./.github/workflows/delete-artifacts.yml
61-
#
62-
#
63-
## test-with-server-rc:
64-
## needs: test-with-server-release
65-
## if: ${{ github.event_name == 'workflow_dispatch' || contains(github.event.pull_request.labels.*.name, 'new-server-features') }}
66-
## uses: ./.github/workflows/test-server-rc.yml
67-
## secrets: inherit
6861
##

‎.github/workflows/docker-build-context/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ARG server_image=aerospike/aerospike-server-enterprise:8.0.0.0-rc1
1+
ARG server_image=aerospike/aerospike-server-enterprise:8.0.0.5
22
ARG ROSTER_FILE_NAME=roster.smd
33
# Temp file for passing node id from one build stage to another
44
# Docker doesn't support command substitution for setting values for ARG variables, so we have to do this

‎.github/workflows/release-workflow.yml‎

Lines changed: 87 additions & 87 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,44 @@
1-
#name: Dev workflow (part 2)
2-
#
3-
#on:
4-
# pull_request:
5-
# types:
6-
# - opened
7-
# - review_requested
8-
# - synchronize
9-
# branches:
10-
# - 'dev*'
11-
# - 'dev-CICD'
12-
# - '2024-Pipeline-Improvement'
13-
# paths-ignore:
14-
# - 'docs/**'
15-
# - 'aerospike-stubs/**'
16-
#
17-
#jobs:
1+
name: Dev workflow (part 2)
2+
3+
on:
4+
pull_request:
5+
types:
6+
- opened
7+
- review_requested
8+
- synchronize
9+
branches:
10+
- 'dev*'
11+
- 'dev-CICD'
12+
- '2024-Pipeline-Improvement'
13+
paths-ignore:
14+
- 'docs/**'
15+
- 'aerospike-stubs/**'
16+
17+
jobs:
1818
# download-jfrog-artifacts:
1919
# uses: ./.github/workflows/download-jfrog-artifacts.yml
2020
# with:
21-
# version: 6.1.0-rc.6
21+
# version: 6.2.0-rc.15
2222
# secrets: inherit
23-
#
24-
## bump-dev-number:
25-
## #if: ${{ github.event_name == 'workflow_dispatch' || github.event.pull_request.merged == true }}
26-
## uses: ./.github/workflows/bump-version.yml
27-
## with:
28-
## change: 'bump-dev-num'
29-
## secrets: inherit
30-
#
31-
## upload-to-jfrog:
32-
## name: Upload artifacts to JFrog
33-
## needs: [
34-
## # bump-dev-number,
35-
## rebuild-artifacts-with-new-dev-num
36-
## ]
37-
## uses: ./.github/workflows/upload-to-jfrog.yml
38-
## with:
39-
## version: ${{ needs.bump-dev-number.outputs.new_version }}
40-
## secrets: inherit
41-
#
23+
24+
# bump-dev-number:
25+
# #if: ${{ github.event_name == 'workflow_dispatch' || github.event.pull_request.merged == true }}
26+
# uses: ./.github/workflows/bump-version.yml
27+
# with:
28+
# change: 'bump-dev-num'
29+
# secrets: inherit
30+
31+
# upload-to-jfrog:
32+
# name: Upload artifacts to JFrog
33+
# needs: [
34+
# # bump-dev-number,
35+
# rebuild-artifacts-with-new-dev-num
36+
# ]
37+
# uses: ./.github/workflows/upload-to-jfrog.yml
38+
# with:
39+
# version: ${{ needs.bump-dev-number.outputs.new_version }}
40+
# secrets: inherit
41+
4242
# publish-to-npm:
4343
# name: Upload artifacts to JFrog
4444
# needs: [
@@ -49,60 +49,60 @@
4949
# ]
5050
# uses: ./.github/workflows/upload-jfrog-build-to-npm.yml
5151
# with:
52-
# version: 6.1.0-rc.6
52+
# version: 6.2.0-rc.15
53+
# secrets: inherit
54+
55+
# release-package:
56+
# name: release npm package
57+
# uses: ./.github/workflows/release-package.yml
58+
# secrets: inherit
59+
60+
# rebuild-artifacts-with-new-dev-num:
61+
# #needs: bump-dev-number
62+
# name: Rebuild artifacts with new dev number
63+
# uses: ./.github/workflows/build-artifacts.yml
5364
# secrets: inherit
5465
#
55-
## release-package:
56-
## name: release npm package
57-
## uses: ./.github/workflows/release-package.yml
58-
## secrets: inherit
59-
#
60-
## rebuild-artifacts-with-new-dev-num:
61-
## #needs: bump-dev-number
62-
## name: Rebuild artifacts with new dev number
63-
## uses: ./.github/workflows/build-artifacts.yml
64-
## secrets: inherit
65-
##
66-
## #test-npm-install:
67-
## # needs: rebuild-artifacts-with-new-dev-num
68-
## # name: Test npm install command for npm package
69-
## # uses: ./.github/workflows/npm-install-script-test.yml
70-
## # secrets: inherit
71-
##
72-
## upload-to-jfrog:
73-
## name: Upload artifacts to JFrog
74-
## needs: [
75-
## # bump-dev-number,
76-
## rebuild-artifacts-with-new-dev-num
77-
## ]
78-
## uses: ./.github/workflows/upload-to-jfrog.yml
79-
## with:
80-
## version: ${{ needs.bump-dev-number.outputs.new_version }}
81-
## secrets: inherit
82-
##
83-
## publish-to-npm:
84-
## name: Upload artifacts to JFrog
85-
## needs: [
86-
## # bump-dev-number,
87-
## rebuild-artifacts-with-new-dev-num,
88-
## upload-to-jfrog
89-
## ]
90-
## uses: ./.github/workflows/upload-jfrog-build-to-npm.yml
91-
## with:
92-
## version: ${{ needs.bump-dev-number.outputs.new_version }}
93-
## secrets: inherit
66+
# #test-npm-install:
67+
# # needs: rebuild-artifacts-with-new-dev-num
68+
# # name: Test npm install command for npm package
69+
# # uses: ./.github/workflows/npm-install-script-test.yml
70+
# # secrets: inherit
9471
#
95-
# verify-npm-install:
96-
# name: verify npm install works correctly
72+
# upload-to-jfrog:
73+
# name: Upload artifacts to JFrog
9774
# needs: [
98-
# download-jfrog-artifacts,
99-
# publish-to-npm
75+
# # bump-dev-number,
76+
# rebuild-artifacts-with-new-dev-num
10077
# ]
101-
# uses: ./.github/workflows/verify-npm-install.yml
78+
# uses: ./.github/workflows/upload-to-jfrog.yml
79+
# with:
80+
# version: ${{ needs.bump-dev-number.outputs.new_version }}
10281
# secrets: inherit
10382
#
104-
## # We don't want the artifacts in JFrog to also exist in Github
105-
## delete-artifacts:
106-
## needs: upload-to-jfrog
107-
## uses: ./.github/workflows/delete-artifacts.yml
108-
##
83+
# publish-to-npm:
84+
# name: Upload artifacts to JFrog
85+
# needs: [
86+
# # bump-dev-number,
87+
# rebuild-artifacts-with-new-dev-num,
88+
# upload-to-jfrog
89+
# ]
90+
# uses: ./.github/workflows/upload-jfrog-build-to-npm.yml
91+
# with:
92+
# version: ${{ needs.bump-dev-number.outputs.new_version }}
93+
# secrets: inherit
94+
95+
verify-npm-install:
96+
name: verify npm install works correctly
97+
#needs: [
98+
# download-jfrog-artifacts,
99+
# publish-to-npm
100+
#]
101+
uses: ./.github/workflows/verify-npm-install.yml
102+
secrets: inherit
103+
104+
# # We don't want the artifacts in JFrog to also exist in Github
105+
# delete-artifacts:
106+
# needs: upload-to-jfrog
107+
# uses: ./.github/workflows/delete-artifacts.yml
108+
#

‎.github/workflows/stage-workflow-p1.yml‎

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -30,17 +30,17 @@
3030
# download-jfrog-artifacts:
3131
# uses: ./.github/workflows/download-jfrog-artifacts.yml
3232
# with:
33-
# version: 6.1.0-dev.6
33+
# version: 6.2.0-dev.14
3434
# secrets: inherit
3535
#
36-
# test-with-server-release:
37-
# uses: ./.github/workflows/test-artifacts.yml
38-
# needs: [
39-
# download-jfrog-artifacts
40-
# ]
41-
# with:
42-
# run_tests: true
43-
# secrets: inherit
36+
## test-with-server-release:
37+
## uses: ./.github/workflows/test-artifacts.yml
38+
## needs: [
39+
## download-jfrog-artifacts
40+
## ]
41+
## with:
42+
## run_tests: true
43+
## secrets: inherit
4444
#
4545
## bump-dev-number:
4646
## #if: ${{ github.event_name == 'workflow_dispatch' || github.event.pull_request.merged == true }}
@@ -57,23 +57,20 @@
5757
# name: Upload artifacts to JFrog
5858
# needs: [
5959
# download-jfrog-artifacts,
60-
# test-with-server-release,
60+
# #test-with-server-release,
6161
# #bump-dev-number
6262
# ]
6363
# uses: ./.github/workflows/upload-to-jfrog.yml
6464
# with:
6565
# stage: true
66-
# version: 6.1.0-rc.6
66+
# version: 6.2.0-rc.15
6767
# secrets: inherit
6868
#
6969
# # We don't want the artifacts in JFrog to also exist in Github
7070
# delete-artifacts:
7171
# needs: upload-to-jfrog
7272
# uses: ./.github/workflows/delete-artifacts.yml
7373
#
74-
#
75-
#
76-
#
7774
## test-with-server-rc:
7875
## needs: test-with-server-release
7976
## if: ${{ github.event_name == 'workflow_dispatch' || contains(github.event.pull_request.labels.*.name, 'new-server-features') }}

0 commit comments

Comments
 (0)