Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dependencies update; Use Redis 7; Added macOS/M1 build #299

Merged
merged 11 commits into from
Mar 26, 2023
Merged
Show file tree
Hide file tree
Changes from 7 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 18 additions & 5 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,11 +56,14 @@ commands:
name: Setup automation
command: |
git submodule update --init deps/readies
if [[ $(uname -s) == Darwin ]]; then rm -f /usr/local/bin/python3; fi
./deps/readies/bin/getpy3
- run:
name: Setup automation (part 2)
shell: /bin/bash -l -eo pipefail
command: |
ls -l /usr/local/bin/python* || true
echo "python3: $(command -v python3)"
python3 --version
python3 -m pip list

Expand All @@ -84,6 +87,7 @@ commands:
name: Install Redis
shell: /bin/bash -l -eo pipefail
command: |
export HOMEBREW_NO_AUTO_UPDATE=1
./deps/readies/bin/getredis -v '<<parameters.redis_version>>' --force <<parameters.getredis_params>>
redis-server --version

Expand Down Expand Up @@ -197,13 +201,20 @@ jobs:
- vm-build-platforms-steps:
platform: <<parameters.platform>>

build-macos:
build-macos-x64:
macos:
xcode: 12.5.1
xcode: 13.2.1
resource_class: macos.x86.medium.gen2
steps:
- build-steps

build-macos-m1:
macos:
xcode: 14.2.0
resource_class: macos.m1.large.gen1
steps:
- build-steps

#----------------------------------------------------------------------------------------------------------------------------------

on-any-branch: &on-any-branch
Expand Down Expand Up @@ -293,12 +304,14 @@ workflows:
context: common
matrix:
parameters:
platform: [jammy, focal, bionic, xenial, rocky8, centos7, bullseye]
platform: [jammy, focal, bionic, xenial, rocky8, centos7, bullseye, amzn2]
- build-arm-platforms:
<<: *on-integ-and-version-tags
context: common
matrix:
parameters:
platform: [jammy, bionic, focal]
- build-macos:
<<: *on-any-branch
- build-macos-x64:
<<: *always
- build-macos-m1:
<<: *on-integ-and-version-tags
2 changes: 1 addition & 1 deletion build/docker/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ include $(ROOT)/deps/readies/mk/main

REPO=redismodule-rs

REDIS_VERSION=6.2.7
REDIS_VERSION=7.0.9
rafie marked this conversation as resolved.
Show resolved Hide resolved

OSNICK.official=bullseye

Expand Down