Skip to content

Update previous release Crystal 1.1.0 #10955

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.

Sign up for GitHub

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

Merged
straight-shoota merged 3 commits into from
Jul 20, 2021
Merged

Update previous release Crystal 1.1.0 #10955

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8490974
Update previous release Crystal 1.1.0
straight-shoota Jul 15, 2021
51ac26e
Update nix commit hashes
straight-shoota Jul 19, 2021
f4df46a
Merge branch 'master' into ci/update-previous-release
straight-shoota Jul 20, 2021
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
2 changes: 1 addition & 1 deletion .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,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/1.0.0/crystal-1.0.0-1"
export PREVIOUS_CRYSTAL_BASE_URL="https://github.com/crystal-lang/crystal/releases/download/1.1.0/crystal-1.1.0-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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/win.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on: [push, pull_request]
jobs:
linux-job:
runs-on: ubuntu-latest
container: crystallang/crystal:1.0.0-build
container: crystallang/crystal:1.1.0-build
steps:
- name: Download Crystal source
uses: actions/checkout@v2
Expand Down
6 changes: 3 additions & 3 deletions bin/ci
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,8 +133,8 @@ format() {
prepare_build() {
on_linux verify_linux_environment

on_osx curl -L https://github.com/crystal-lang/crystal/releases/download/1.0.0/crystal-1.0.0-1-darwin-x86_64.tar.gz -o ~/crystal.tar.gz
on_osx 'pushd ~;gunzip -c ~/crystal.tar.gz | tar xopf -;mv crystal-1.0.0-1 crystal;popd'
on_osx curl -L https://github.com/crystal-lang/crystal/releases/download/1.1.0/crystal-1.1.0-1-darwin-x86_64.tar.gz -o ~/crystal.tar.gz
on_osx 'pushd ~;gunzip -c ~/crystal.tar.gz | tar xopf -;mv crystal-1.1.0-1 crystal;popd'

# These commands may take a few minutes to run due to the large size of the repositories.
# This restriction has been made on GitHub's request because updating shallow
Expand Down Expand Up @@ -187,7 +187,7 @@ with_build_env() {

on_linux verify_linux_environment

export DOCKER_TEST_PREFIX="${DOCKER_TEST_PREFIX:=crystallang/crystal:1.0.0}"
export DOCKER_TEST_PREFIX="${DOCKER_TEST_PREFIX:=crystallang/crystal:1.1.0}"

case $ARCH in
x86_64)
Expand Down
12 changes: 6 additions & 6 deletions shell.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,18 +52,18 @@ let
# Hashes obtained using `nix-prefetch-url --unpack <url>`
latestCrystalBinary = genericBinary ({
x86_64-darwin = {
url = "https://github.com/crystal-lang/crystal/releases/download/1.0.0/crystal-1.0.0-1-darwin-x86_64.tar.gz";
sha256 = "sha256:1ff05f7v31r7xw4xk1a5zns77k3hrgdb9cn15w2zsps83iqlq81i";
url = "https://github.com/crystal-lang/crystal/releases/download/1.1.0/crystal-1.1.0-1-darwin-x86_64.tar.gz";
sha256 = "sha256:0dk893g5v3y11hfmr6viskhajnlippwcs8ra8azxa9rjh47lx8zg";
};

x86_64-linux = {
url = "https://github.com/crystal-lang/crystal/releases/download/1.0.0/crystal-1.0.0-1-linux-x86_64.tar.gz";
sha256 = "sha256:13940gjs1zl29wrhngzylhckxgzb8xh16bniqik5lslp6qpljqy4";
url = "https://github.com/crystal-lang/crystal/releases/download/1.1.0/crystal-1.1.0-1-linux-x86_64.tar.gz";
sha256 = "sha256:1n967087p0km0v4pr7xyl4gg5cfl1zap7kas94gw4cs4a90irwgd";
};

i686-linux = {
url = "https://github.com/crystal-lang/crystal/releases/download/1.0.0/crystal-1.0.0-1-linux-i686.tar.gz";
sha256 = "sha256:18xg2nxg68cx0ngidpzy68wa5zqmcz0xfm0im5sg8j8bnj8ccg35";
url = "https://github.com/crystal-lang/crystal/releases/download/1.1.0/crystal-1.1.0-1-linux-i686.tar.gz";
sha256 = "sha256:06qzhrq4la7fkk1y6nr5kq52gxfnrlbnh9lg7ppbxqglr39ygml3";
};
}.${pkgs.stdenv.system});

Expand Down
2 changes: 1 addition & 1 deletion src/VERSION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.1.0
1.2.0-dev

@asterite asterite Jul 19, 2021

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should this be 1.1.1? I think we have at least one fix for that version.

@straight-shoota straight-shoota Jul 19, 2021 •
edited
Loading

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The master branch should be heading towards the next minor release. We shouldn't keep it frozen any longer (it's been a month now).

If we need patch releases, the bugfixes would be backported to the release/1.1 branch.
What fix do you have in mind?

@straight-shoota straight-shoota Jul 19, 2021

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, I guess #10960?

@asterite asterite Jul 19, 2021

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, that one. But I can't remember how branches and releases work, so better to ignore me 😅