From f5107008988769dc3efd5f75cc5ecc17be478d4a Mon Sep 17 00:00:00 2001 From: Jesse Schmidt Date: Tue, 28 May 2024 13:05:11 -0700 Subject: [PATCH 1/7] add mac11 build --- .github/workflows/mac-artifact.yml | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/.github/workflows/mac-artifact.yml b/.github/workflows/mac-artifact.yml index 7a8ef590..bbea7c5d 100644 --- a/.github/workflows/mac-artifact.yml +++ b/.github/workflows/mac-artifact.yml @@ -1,7 +1,7 @@ name: Mac Artifact on: push: - branches: [ main, test-ready, "bugfix-*" ] + branches: [ main, actionsHub, "bugfix-*" ] pull_request: branches: [] workflow_call: @@ -12,10 +12,19 @@ on: type: string jobs: build: - runs-on: macos-11 strategy: matrix: - ev-lib: ["", libev, libuv, libevent] + os: [macos-11, macos-14] + # ev-lib: ["", libev, libuv, libevent] + ev-lib: [libuv] + include: + - os: macos-11 + openssl-path: /usr/local/opt/openssl + ev-path: /usr/local + - os: macos-14 + openssl-path: /opt/homebrew/opt/openssl + ev-path: /opt/homebrew + runs-on: ${{ matrix.os }} env: LIBYAML_VERSION: 0.2.5 steps: @@ -55,7 +64,7 @@ jobs: git describe --tags --always - name: Build asbench run: | - make EVENT_LIB=${{ matrix.ev-lib }} LIBUV_STATIC_PATH=/usr/local/lib LIBEVENT_STATIC_PATH=/usr/local/lib LIBEV_STATIC_PATH=/usr/local/lib OPENSSL_STATIC_PATH=/usr/local/opt/openssl/lib + make EVENT_LIB=${{ matrix.ev-lib }} LIBUV_STATIC_PATH=${{ matrix.ev-path }}/lib LIBEVENT_STATIC_PATH=${{ matrix.ev-path }}/lib LIBEV_STATIC_PATH=${{ matrix.ev-path }}/lib OPENSSL_STATIC_PATH=${{ matrix.openssl-path }}/lib working-directory: ${{ steps.working-dir.outputs.value }} - name: Sanity test asbench artifact run: | From d4882cb03a959558188f08a4313f8d7493ae13ed Mon Sep 17 00:00:00 2001 From: Jesse Schmidt Date: Tue, 28 May 2024 14:33:11 -0700 Subject: [PATCH 2/7] update actions-system-info@v1.3.0 --- .github/workflows/mac-artifact.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/mac-artifact.yml b/.github/workflows/mac-artifact.yml index bbea7c5d..1fd4f770 100644 --- a/.github/workflows/mac-artifact.yml +++ b/.github/workflows/mac-artifact.yml @@ -42,7 +42,7 @@ jobs: cond: ${{ inputs.submodule != '' }} if_true: aerospike-tools/${{ inputs.submodule }} # In this case we are expecting to checkout the tools package. if_false: asbench - - uses: kenchan0130/actions-system-info@v1.1.0 + - uses: kenchan0130/actions-system-info@v1.3.0 id: system-info - name: Install dependencies from brew run: | From 6decd5ad0e4a9544834bbb7eed7dea7c957acada Mon Sep 17 00:00:00 2001 From: Jesse Schmidt Date: Tue, 28 May 2024 14:58:36 -0700 Subject: [PATCH 3/7] update actions --- .github/workflows/mac-artifact.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/mac-artifact.yml b/.github/workflows/mac-artifact.yml index 1fd4f770..b66518e9 100644 --- a/.github/workflows/mac-artifact.yml +++ b/.github/workflows/mac-artifact.yml @@ -89,13 +89,13 @@ jobs: if: "${{ inputs.submodule == '' }}" steps: - - uses: kenchan0130/actions-system-info@v1.1.0 + - uses: kenchan0130/actions-system-info@v1.3.0 id: system-info - name: Get artifacts uses: actions/download-artifact@v3 with: path: target - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 with: name: binaries path: target From de63fdbeb7108f40da8ca728b8d8d4c002fef4a6 Mon Sep 17 00:00:00 2001 From: Jesse Schmidt Date: Tue, 28 May 2024 15:13:00 -0700 Subject: [PATCH 4/7] update actions --- .github/workflows/mac-artifact.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/mac-artifact.yml b/.github/workflows/mac-artifact.yml index b66518e9..7734f06f 100644 --- a/.github/workflows/mac-artifact.yml +++ b/.github/workflows/mac-artifact.yml @@ -78,7 +78,7 @@ jobs: if_true: asbench if_false: asbench-${{ matrix.ev-lib }} - name: Upload artifact - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: ${{ steps.system-info.outputs.platform }}-${{ runner.arch }}-${{ runner.os }}-${{ steps.system-info.outputs.release }}-${{ steps.artifact-name.outputs.value }} path: ${{ steps.working-dir.outputs.value }}/target/asbench From 98d8d780147c491adc9697b9c107755ddaa67f85 Mon Sep 17 00:00:00 2001 From: dwelch-spike <53876192+dwelch-spike@users.noreply.github.com> Date: Wed, 17 Jul 2024 10:24:38 -0700 Subject: [PATCH 5/7] bump macos-11 runners to macos-12 --- .github/workflows/mac-artifact.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/mac-artifact.yml b/.github/workflows/mac-artifact.yml index 7734f06f..0f42638f 100644 --- a/.github/workflows/mac-artifact.yml +++ b/.github/workflows/mac-artifact.yml @@ -14,11 +14,11 @@ jobs: build: strategy: matrix: - os: [macos-11, macos-14] + os: [macos-12, macos-14] # ev-lib: ["", libev, libuv, libevent] ev-lib: [libuv] include: - - os: macos-11 + - os: macos-12 openssl-path: /usr/local/opt/openssl ev-path: /usr/local - os: macos-14 From aad065787a3513b4612f64da2ad1e53375d5f21a Mon Sep 17 00:00:00 2001 From: dylan Date: Tue, 30 Jul 2024 13:53:37 -0700 Subject: [PATCH 6/7] ci: check for subclasses of dict, python client 15 and up may return aerospike.KeyOrderedDict --- src/test/integration/test_object_spec.py | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/src/test/integration/test_object_spec.py b/src/test/integration/test_object_spec.py index d0e17ee0..74e5c5ed 100644 --- a/src/test/integration/test_object_spec.py +++ b/src/test/integration/test_object_spec.py @@ -159,7 +159,8 @@ def check_bin(b): def test_map(): def check_bin(b): - assert(type(b) is dict) + # Python client may return a aerospike.KeyOrderedDict + assert(issubclass(type(b), dict)) assert(len(b) == 50) for key in b: lib.obj_spec_is_S(key, 5) @@ -171,7 +172,8 @@ def check_bin(b): def test_const_map(): def check_bin(b): - assert(type(b) is dict) + # Python client may return a aerospike.KeyOrderedDict + assert(issubclass(type(b), dict)) assert(len(b) == 1) for key in b: lib.obj_spec_is_const_I(key, 123) @@ -186,7 +188,8 @@ def check_bin(b): assert(type(b) is list) assert(len(b) == 3) - assert(type(b[0]) is dict) + # Python client may return a aerospike.KeyOrderedDict + assert(issubclass(type(b[0]), dict)) assert(len(b[0]) == 50) for key in b[0]: lib.obj_spec_is_S(key, 5) @@ -199,7 +202,9 @@ def check_bin(b): lib.obj_spec_is_D(b[2][0]) lib.obj_spec_is_I2(b[2][1]) - assert(type(b[2][2]) is dict) + + # Python client may return a aerospike.KeyOrderedDict + assert(issubclass(type(b[2][2]), dict)) assert(len(b[2][2]) == 10) for key in b[2][2]: lib.obj_spec_is_I5(key) @@ -231,7 +236,9 @@ def check_bins(b): assert(type(b["testbin"]) is list) lib.obj_spec_is_I1(b["testbin"][0]) - assert(type(b["testbin"][1]) is dict) + + # Python client may return a aerospike.KeyOrderedDict + assert(issubclass(type(b["testbin"][1]), dict)) assert(len(b["testbin"][1]) == 45) for key in b["testbin"][1]: lib.obj_spec_is_S(key, 32) @@ -240,7 +247,8 @@ def check_bins(b): lib.obj_spec_is_I2(b["testbin_2"]) lib.obj_spec_is_I3(b["testbin_3"]) - assert(type(b["testbin_4"]) is dict) + # Python client may return a aerospike.KeyOrderedDict + assert(issubclass(type(b["testbin_4"]), dict)) assert(len(b["testbin_4"]) == 1) for key in b["testbin_4"]: lib.obj_spec_is_S(key, 10) From de1d7253f1ec36d425b50f6bc0d992f0ed53ce54 Mon Sep 17 00:00:00 2001 From: dylan Date: Tue, 30 Jul 2024 14:10:31 -0700 Subject: [PATCH 7/7] build: bump bundle runner to macos-14 --- .github/workflows/mac-artifact.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/mac-artifact.yml b/.github/workflows/mac-artifact.yml index 0f42638f..ad15ed39 100644 --- a/.github/workflows/mac-artifact.yml +++ b/.github/workflows/mac-artifact.yml @@ -85,7 +85,7 @@ jobs: if-no-files-found: error bundle-binaries: needs: build - runs-on: macos-11 + runs-on: macos-14 if: "${{ inputs.submodule == '' }}" steps: