From a528f9bd053af3e4dd7e5565ebf1c6fb4cb16ddc Mon Sep 17 00:00:00 2001 From: "Brian J. Cardiff" Date: Thu, 24 May 2018 18:45:24 +0200 Subject: [PATCH 1/3] Compile 32 bits packages in ci --- .circleci/config.yml | 32 +++++++++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 1e2fb6839f11..64549d063ef5 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -67,7 +67,7 @@ jobs: - run: | git clone https://github.com/crystal-lang/distribution-scripts.git ~/distribution-scripts cd ~/distribution-scripts - git checkout a026d041d98bd3ceb84b8d70a37e662e6e6aa765 + git checkout 4d0e3169857ce40a84c2ba8269c56c3cb78f882e # persist relevant information for build process - run: | cd ~/distribution-scripts @@ -80,6 +80,7 @@ jobs: # Which previous version use export PREVIOUS_CRYSTAL_BASE_URL="https://github.com/crystal-lang/crystal/releases/download/0.24.2/crystal-0.24.2-1" echo "export PREVIOUS_CRYSTAL_RELEASE_LINUX_TARGZ=${PREVIOUS_CRYSTAL_BASE_URL}-linux-x86_64.tar.gz" >> build.env + echo "export PREVIOUS_CRYSTAL_RELEASE_LINUX32_TARGZ=${PREVIOUS_CRYSTAL_BASE_URL}-linux-i686.tar.gz" >> build.env echo "export PREVIOUS_CRYSTAL_RELEASE_DARWIN_TARGZ=${PREVIOUS_CRYSTAL_BASE_URL}-darwin-x86_64.tar.gz" >> build.env cat build.env @@ -172,6 +173,21 @@ jobs: paths: - build + dist_linux32: + machine: true + steps: + - attach_workspace: + at: /tmp/workspace + - run: | + cd /tmp/workspace/distribution-scripts + source build.env + cd linux + make all32 release=true + - persist_to_workspace: + root: /tmp/workspace/distribution-scripts/linux/ + paths: + - build + dist_darwin: macos: xcode: "9.0" @@ -298,6 +314,10 @@ workflows: filters: *per_tag requires: - prepare_tagged + - dist_linux32: + filters: *per_tag + requires: + - prepare_tagged - dist_darwin: filters: *per_tag requires: @@ -316,6 +336,7 @@ workflows: filters: *per_tag requires: - dist_linux + - dist_linux32 - dist_darwin - dist_docker - dist_docs @@ -343,6 +364,9 @@ workflows: - dist_linux: requires: - prepare_nightly + - dist_linux32: + requires: + - prepare_nightly - dist_darwin: requires: - prepare_nightly @@ -358,6 +382,7 @@ workflows: - dist_artifacts: requires: - dist_linux + - dist_linux32 - dist_darwin - dist_docker - dist_docs @@ -388,6 +413,10 @@ workflows: filters: *maintenance requires: - prepare_maintenance + - dist_linux32: + filters: *maintenance + requires: + - prepare_maintenance - dist_darwin: filters: *maintenance requires: @@ -408,6 +437,7 @@ workflows: filters: *maintenance requires: - dist_linux + - dist_linux32 - dist_darwin - dist_docker - dist_docs From be9e83d5e6e09c3fed12b1a116dbc4b5c46b90a9 Mon Sep 17 00:00:00 2001 From: "Brian J. Cardiff" Date: Fri, 1 Jun 2018 10:52:15 +0200 Subject: [PATCH 2/3] Update to use all64 make target --- .circleci/config.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 64549d063ef5..e92742d638e3 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -67,7 +67,7 @@ jobs: - run: | git clone https://github.com/crystal-lang/distribution-scripts.git ~/distribution-scripts cd ~/distribution-scripts - git checkout 4d0e3169857ce40a84c2ba8269c56c3cb78f882e + git checkout 0a21a002309eb17c581394f03b3cf1f1eb8d4450 # persist relevant information for build process - run: | cd ~/distribution-scripts @@ -79,7 +79,7 @@ jobs: # Which previous version use export PREVIOUS_CRYSTAL_BASE_URL="https://github.com/crystal-lang/crystal/releases/download/0.24.2/crystal-0.24.2-1" - echo "export PREVIOUS_CRYSTAL_RELEASE_LINUX_TARGZ=${PREVIOUS_CRYSTAL_BASE_URL}-linux-x86_64.tar.gz" >> build.env + echo "export PREVIOUS_CRYSTAL_RELEASE_LINUX64_TARGZ=${PREVIOUS_CRYSTAL_BASE_URL}-linux-x86_64.tar.gz" >> build.env echo "export PREVIOUS_CRYSTAL_RELEASE_LINUX32_TARGZ=${PREVIOUS_CRYSTAL_BASE_URL}-linux-i686.tar.gz" >> build.env echo "export PREVIOUS_CRYSTAL_RELEASE_DARWIN_TARGZ=${PREVIOUS_CRYSTAL_BASE_URL}-darwin-x86_64.tar.gz" >> build.env @@ -167,7 +167,7 @@ jobs: cd /tmp/workspace/distribution-scripts source build.env cd linux - make release=true + make all64 release=true - persist_to_workspace: root: /tmp/workspace/distribution-scripts/linux/ paths: From a30664e04d118d894fdcc5be047ba306d76d7b94 Mon Sep 17 00:00:00 2001 From: "Brian J. Cardiff" Date: Tue, 5 Jun 2018 17:58:14 +0200 Subject: [PATCH 3/3] Update distribution scripts to use shards 0.8.0 --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index e92742d638e3..a9e2e42fd890 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -67,7 +67,7 @@ jobs: - run: | git clone https://github.com/crystal-lang/distribution-scripts.git ~/distribution-scripts cd ~/distribution-scripts - git checkout 0a21a002309eb17c581394f03b3cf1f1eb8d4450 + git checkout ad632438cd4458993e5c525be5063aa537b27585 # persist relevant information for build process - run: | cd ~/distribution-scripts