Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: crystal-lang/crystal
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: f8ef17f4502c5ef52272f55776dde8172b1a757e
Choose a base ref
..
head repository: crystal-lang/crystal
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: a6c98ebc34af40975ccb885df9a4924225893f1d
Choose a head ref
Showing 452 changed files with 5,787 additions and 1,631 deletions.
92 changes: 86 additions & 6 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -45,7 +45,34 @@ jobs:
environment:
<<: *env
TRAVIS_OS_NAME: osx
steps: *ci_steps
steps:
- restore_cache:
keys:
- brew-cache-v1
- checkout
- run: bin/ci prepare_system
- run: echo 'export CURRENT_TAG="$CIRCLE_TAG"' >> $BASH_ENV
- run: bin/ci prepare_build
- run: bin/ci build
- save_cache:
key: brew-cache-v1
paths:
- /usr/local/Homebrew
- ~/Library/Caches/Homebrew/downloads

check_format:
machine: true
environment:
<<: *env
TRAVIS_OS_NAME: linux
ARCH: x86_64
ARCH_CMD: linux64
steps:
- checkout
- run: bin/ci prepare_system
- run: echo 'export CURRENT_TAG="$CIRCLE_TAG"' >> $BASH_ENV
- run: bin/ci prepare_build
- run: bin/ci format

sync_docs_s3:
machine: true
@@ -69,7 +96,7 @@ jobs:
- run: |
git clone https://github.com/crystal-lang/distribution-scripts.git ~/distribution-scripts
cd ~/distribution-scripts
git checkout f83d13b3232d4e8594a2638f78ebbabc6b760467
git checkout a6a7a322df05fd57e8f1b1b9020045dd13e679c0
# persist relevant information for build process
- run: |
cd ~/distribution-scripts
@@ -80,7 +107,7 @@ jobs:
echo "export CRYSTAL_SHA1=$CIRCLE_SHA1" >> build.env
# Which previous version use
export PREVIOUS_CRYSTAL_BASE_URL="https://github.com/crystal-lang/crystal/releases/download/0.27.0/crystal-0.27.0-1"
export PREVIOUS_CRYSTAL_BASE_URL="https://github.com/crystal-lang/crystal/releases/download/0.27.2/crystal-0.27.2-1"
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
@@ -199,6 +226,9 @@ jobs:
xcode: "9.0"
shell: /bin/bash --login -eo pipefail
steps:
- restore_cache:
keys:
- brew-cache-v1
- run:
name: Setup environment
command: |
@@ -280,20 +310,51 @@ jobs:
path: /tmp/workspace/build
destination: dist_packages

test_dist_linux_on_docker:
machine: true
environment:
<<: *env
TRAVIS_OS_NAME: linux
ARCH: x86_64
ARCH_CMD: linux64
steps:
- attach_workspace:
at: /tmp/workspace
- run: |
cd /tmp/workspace/distribution-scripts
source ./build.env
gunzip -c /tmp/workspace/build/docker-${CRYSTAL_VERSION}.tar.gz | docker image load
export DOCKER_TEST_PREFIX="crystallang/crystal:$DOCKER_TAG" >> $BASH_ENV
- checkout
- run: bin/ci prepare_system
- run: echo 'export CURRENT_TAG="$CIRCLE_TAG"' >> $BASH_ENV
- run: bin/ci prepare_build
- run: bin/ci build

workflows:
version: 2
test_all_platforms:
jobs:
- test_linux
- test_linux32
- test_darwin
- test_linux:
filters: &unless_maintenance
branches:
ignore:
- /release\/.+/
- /.*\bci\b.*/
- test_linux32:
filters: *unless_maintenance
- test_darwin:
filters: *unless_maintenance
- check_format:
filters: *unless_maintenance
- sync_docs_s3:
filters:
branches:
only:
- master
requires:
- test_linux

tagged_release:
jobs:
- test_linux:
@@ -306,12 +367,15 @@ workflows:
filters: *per_tag
- test_darwin:
filters: *per_tag
- check_format:
filters: *per_tag
- prepare_common:
filters: *per_tag
requires:
- test_linux
- test_linux32
- test_darwin
- check_format
- prepare_tagged:
filters: *per_tag
requires:
@@ -332,6 +396,10 @@ workflows:
filters: *per_tag
requires:
- dist_linux
- test_dist_linux_on_docker:
filters: *per_tag
requires:
- dist_docker
# Tagged release do not publish docker images since they are unsigned
# publish_docker:
- dist_docs:
@@ -359,11 +427,13 @@ workflows:
- test_linux
- test_linux32
- test_darwin
- check_format
- prepare_common:
requires:
- test_linux
- test_linux32
- test_darwin
- check_format
- prepare_nightly:
requires:
- prepare_common
@@ -379,6 +449,9 @@ workflows:
- dist_docker:
requires:
- dist_linux
- test_dist_linux_on_docker:
requires:
- dist_docker
- publish_docker:
requires:
- dist_docker
@@ -405,12 +478,15 @@ workflows:
filters: *maintenance
- test_darwin:
filters: *maintenance
- check_format:
filters: *maintenance
- prepare_common:
filters: *maintenance
requires:
- test_linux
- test_linux32
- test_darwin
- check_format
- prepare_maintenance:
filters: *maintenance
requires:
@@ -431,6 +507,10 @@ workflows:
filters: *maintenance
requires:
- dist_linux
- test_dist_linux_on_docker:
filters: *maintenance
requires:
- dist_docker
- publish_docker:
filters: *maintenance
requires:
6 changes: 3 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -9,9 +9,9 @@ services:
matrix:
fast_finish: true
include:
- env: ARCH=i386 ARCH_CMD=linux32
- env: ARCH=x86_64 ARCH_CMD=linux64 CI_CMD=build
os: linux
- env: ARCH=x86_64 ARCH_CMD=linux64
- env: ARCH=x86_64 ARCH_CMD=linux64 CI_CMD=format
os: linux

git:
@@ -27,7 +27,7 @@ install:
- travis_retry bin/ci prepare_build

script:
- travis_retry bin/ci build
- travis_retry bin/ci $CI_CMD

branches:
only:
Loading