diff --git a/.github/workflows/build-wheels.yml b/.github/workflows/build-wheels.yml index 37f8b7ae0..334f82dc8 100644 --- a/.github/workflows/build-wheels.yml +++ b/.github/workflows/build-wheels.yml @@ -325,7 +325,8 @@ jobs: ref: ${{ env.COMMIT_SHA_TO_BUILD_AND_TEST }} # Need to be able to save Docker Hub credentials to keychain - - if: ${{ inputs.platform-tag == 'macosx_arm64' && inputs.use-server-rc }} + # Unable to do this via the ansible script for self hosted mac m1 runners + - if: ${{ inputs.platform-tag == 'macosx_arm64' }} run: security unlock-keychain -p ${{ secrets.MAC_M1_SELF_HOSTED_RUNNER_PW }} - uses: ./.github/actions/run-ee-server diff --git a/aerospike-client-c b/aerospike-client-c index 886306eee..5bffa81cc 160000 --- a/aerospike-client-c +++ b/aerospike-client-c @@ -1 +1 @@ -Subproject commit 886306eeea9869190cae9c0a7782eee83e1c345d +Subproject commit 5bffa81ccf98f36951cf3d638bacea463dd27580 diff --git a/src/main/exception.c b/src/main/exception.c index c0884ec81..4c681131e 100644 --- a/src/main/exception.c +++ b/src/main/exception.c @@ -111,6 +111,8 @@ struct exception_def exception_defs[] = { AEROSPIKE_ERR_ASYNC_CONNECTION, NULL), EXCEPTION_DEF("ClientAbortError", CLIENT_ERR_EXCEPTION_NAME, AEROSPIKE_ERR_CLIENT_ABORT, NULL), + EXCEPTION_DEF("TranactionFailed", CLIENT_ERR_EXCEPTION_NAME, + AEROSPIKE_TXN_FAILED, NULL), // Server errors EXCEPTION_DEF("InvalidRequest", SERVER_ERR_EXCEPTION_NAME, AEROSPIKE_ERR_REQUEST_INVALID, NULL),