Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/dev' into CLIENT-2512-sanitizer-…
Browse files Browse the repository at this point in the history
…update
  • Loading branch information
juliannguyen4 committed Aug 8, 2024
2 parents f42df2e + 5fc5cfb commit 2450b94
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 21 deletions.
26 changes: 6 additions & 20 deletions .github/workflows/build-wheels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -345,23 +345,13 @@ jobs:
- 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
- uses: ./.github/actions/run-ee-server
if: ${{ inputs.run_tests }}
run: docker run -d -p 3000:3000 --pull always --name aerospike ${{ env.IMAGE_NAME }}
with:
use-server-rc: ${{ inputs.use-server-rc }}
server-tag: ${{ inputs.server-tag }}
docker-hub-username: ${{ secrets.DOCKER_HUB_BOT_USERNAME }}
docker-hub-password: ${{ secrets.DOCKER_HUB_BOT_PW }}

- name: Set unoptimize flag
if: ${{ inputs.apply-no-optimizations }}
Expand All @@ -377,10 +367,6 @@ jobs:
run: python${{ matrix.python-version[1] }} -m pip install --break-system-packages --force-reinstall delocate -c ./requirements.txt
working-directory: .github/workflows

- name: Create config.conf
run: cp config.conf.template config.conf
working-directory: test

- run: delocate-wheel --require-archs "arm64" -w wheelhouse/ -v dist/*.whl
- run: python${{ matrix.python-version[1] }} -m pip install --break-system-packages --find-links=wheelhouse/ --no-index --force-reinstall aerospike

Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
15.0.1rc4.dev9
15.0.1rc4.dev10

0 comments on commit 2450b94

Please sign in to comment.