Multi-platform build, take 2 (#1598)

rafie · web-flow · commit acde69340f05 · 2021-02-27T19:40:03.000+02:00
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -130,14 +130,14 @@ commands:
           name: Build for platform
           command: |
             cd build/docker
-            make build OSNICK=<<parameters.platform>> X64=1 ARTIFACTS=1 TEST=1 SHOW=1
+            make build OSNICK=<<parameters.platform>> ARTIFACTS=1 TEST=1 SHOW=1
       - early_return_for_forked_pull_requests
       - run:
           name: Build for platform (publish)
           command: |
             docker login -u redisfab -p $DOCKER_REDISFAB_PWD
             cd build/docker
-            make publish OSNICK=<<parameters.platform>> X64=1 SHOW=1
+            make publish OSNICK=<<parameters.platform>> OFFICIAL=0 SHOW=1 VERBOSE=1
       - persist_to_workspace:
           root: bin/artifacts
           paths:
@@ -158,15 +158,12 @@ jobs:
       - checkout
       - setup-prerequisits
       - load-cached-deps
-
       - run:
           name: Build
           command: |
             make
             make package
-
       - save-deps-cache
-
       - run:
           name: Test
           command: make test
@@ -184,7 +181,6 @@ jobs:
       - load-cached-deps
       - attach_workspace:
           at: /workspace
-
       - run:
           name: Test for memory leaks
           command: |
@@ -207,10 +203,19 @@ jobs:
       - setup-prerequisits
       - run:
           name: Build
-          command: make
+          command: |
+            make
+            make package
       - run:
           name: Test
           command: make test
+      - persist_to_workspace:
+          root: bin/artifacts
+          paths:
+            - 'snapshots/*.zip'
+            - 'snapshots/*.tgz'
+            - '*.zip'
+            - '*.tgz'
 
   platform_build:
     parameters:
@@ -233,7 +238,7 @@ jobs:
           command: |
             du -ah --apparent-size artifacts/snapshots/*
             for f in artifacts/snapshots/*.zip artifacts/snapshots/*.tgz; do
-              echo aws s3 cp $f s3://redismodules/$PACKAGE_NAME/snapshots/ --acl public-read
+              aws s3 cp $f s3://redismodules/$PACKAGE_NAME/snapshots/ --acl public-read
             done
 
   deploy_release:
@@ -247,7 +252,7 @@ jobs:
           command: |
             du -ah --apparent-size artifacts/*
             for f in artifacts/*.zip artifacts/*.tgz; do
-              echo aws s3 cp $f s3://redismodules/$PACKAGE_NAME/ --acl public-read
+              aws s3 cp $f s3://redismodules/$PACKAGE_NAME/ --acl public-read
             done
 
   release_automation:
@@ -272,7 +277,7 @@ jobs:
 
   performance_ci_automation:
     docker:
-      - image: 'redisfab/rmbuilder:6.0.9-x64-bionic'
+      - image: redisfab/rmbuilder:6.0.9-x64-bionic
     steps:
       - early_return_for_forked_pull_requests
       - checkout
@@ -282,7 +287,7 @@ jobs:
 
   nightly_performance_automation:
     docker:
-      - image: 'redisfab/rmbuilder:6.0.9-x64-bionic'
+      - image: redisfab/rmbuilder:6.0.9-x64-bionic
     steps:
       - early_return_for_forked_pull_requests
       - checkout
@@ -298,6 +303,7 @@ jobs:
       - benchmark-automation:
           github_actor: "ci.nightly"
 
+
 on-any-branch: &on-any-branch
   filters:
     branches:
@@ -373,6 +379,7 @@ workflows:
       - deploy_branch:
           requires:
             - platform_build
+            - build_macos
           <<: *on-integ-branch
       - release_automation:
           requires:
@@ -381,6 +388,7 @@ workflows:
           <<: *on-version-tags
           requires:
             - platform_build
+            - build_macos
       - performance_ci_automation:
           <<: *on-integ-branch
           requires:
diff --git a/Dockerfile b/Dockerfile
@@ -31,13 +31,18 @@ COPY --from=redis /usr/local/ /usr/local/
 ADD ./ /build
 
 # Set up a build environment
+RUN if [ ! -d ./deps/readies ]; then \
+        mkdir -p deps ;\
+        cd deps ;\
+        git clone https://github.com/RedisLabsModules/readies.git ;\
+    fi
 RUN ./deps/readies/bin/getpy3
 RUN ./sbin/system-setup.py
 
 RUN if [ ! -z $(command -v apt-get) ]; then \
         locale-gen --purge en_US.UTF-8 ;\
         dpkg-reconfigure -f noninteractive locales ;\
-	fi
+    fi
 
 ENV LANG=en_US.UTF-8
 ENV LANGUAGE=en_US.UTF-8
diff --git a/build/docker/Makefile b/build/docker/Makefile
@@ -8,6 +8,8 @@ OSNICK ?= buster
 
 REPO=redisgraph
 
+INT_BRANCHES=2.2 2.0 1.2 1.0
+
 ART_DIR=$(ROOT)/bin/artifacts
 ART_INT_DIR=/var/opt/redislabs/artifacts
 
