Skip to content

Commit

Permalink
Merge branch 'master' into infra/shell.nix-nixpkgs-24.05
Browse files Browse the repository at this point in the history
  • Loading branch information
straight-shoota authored Aug 7, 2024
2 parents 70d8f90 + b954dd7 commit b84a32b
Show file tree
Hide file tree
Showing 233 changed files with 3,657 additions and 1,451 deletions.
12 changes: 3 additions & 9 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ parameters:
distribution-scripts-version:
description: "Git ref for version of https://github.com/crystal-lang/distribution-scripts/"
type: string
default: "a9e0c6c12987b8b01b17e71c38f489e45937e1bf"
default: "96e431e170979125018bd4fd90111a3147477eec"
previous_crystal_base_url:
description: "Prefix for URLs to Crystal bootstrap compiler"
type: string
default: "https://github.com/crystal-lang/crystal/releases/download/1.12.1/crystal-1.12.1-1"
default: "https://github.com/crystal-lang/crystal/releases/download/1.13.1/crystal-1.13.1-1"

defaults:
environment: &env
Expand Down Expand Up @@ -296,12 +296,7 @@ jobs:
command: |
brew unlink python@2 || true
# We need ruby-install >= 0.8.3
brew install ruby-install
ruby-install ruby 2.7.3
brew install pkgconfig libtool
brew install ruby@3 libffi pkgconfig libtool automake
sudo mkdir -p /opt/crystal
sudo chown $(whoami) /opt/crystal/
Expand All @@ -312,7 +307,6 @@ jobs:
- run:
no_output_timeout: 40m
command: |
echo "2.7.3" > /tmp/workspace/distribution-scripts/.ruby-version
cd /tmp/workspace/distribution-scripts
source build.env
cd omnibus
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/interpreter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
test-interpreter_spec:
runs-on: ubuntu-22.04
container:
image: crystallang/crystal:1.12.1-build
image: crystallang/crystal:1.13.1-build
name: "Test Interpreter"
steps:
- uses: actions/checkout@v4
Expand All @@ -24,7 +24,7 @@ jobs:
build-interpreter:
runs-on: ubuntu-22.04
container:
image: crystallang/crystal:1.12.1-build
image: crystallang/crystal:1.13.1-build
name: Build interpreter
steps:
- uses: actions/checkout@v4
Expand All @@ -43,7 +43,7 @@ jobs:
needs: build-interpreter
runs-on: ubuntu-22.04
container:
image: crystallang/crystal:1.12.1-build
image: crystallang/crystal:1.13.1-build
strategy:
matrix:
part: [0, 1, 2, 3]
Expand All @@ -67,7 +67,7 @@ jobs:
needs: build-interpreter
runs-on: ubuntu-22.04
container:
image: crystallang/crystal:1.11.2-build
image: crystallang/crystal:1.13.1-build
name: "Test primitives_spec with interpreter"
steps:
- uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
crystal_bootstrap_version: [1.7.3, 1.8.2, 1.9.2, 1.10.1, 1.11.2, 1.12.1]
crystal_bootstrap_version: [1.7.3, 1.8.2, 1.9.2, 1.10.1, 1.11.2, 1.12.2, 1.13.1]
flags: [""]
include:
# libffi is only available starting from the 1.2.2 build images
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/llvm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ jobs:
- name: Install Crystal
uses: crystal-lang/install-crystal@v1
with:
crystal: "1.12.1"
crystal: "1.13.1"

- name: Build libllvm_ext
run: make -B deps
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/openssl.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,39 +10,39 @@ jobs:
openssl3:
runs-on: ubuntu-latest
name: "OpenSSL 3.0"
container: crystallang/crystal:1.12.1-alpine
container: crystallang/crystal:1.13.1-alpine
steps:
- name: Download Crystal source
uses: actions/checkout@v4
- name: Uninstall openssl 1.1
run: apk del openssl-dev
- name: Uninstall openssl
run: apk del openssl-dev libxml2-static
- name: Upgrade alpine-keys
run: apk upgrade alpine-keys
- name: Install openssl 3.0
run: apk add "openssl-dev=~3.0"
run: apk add "openssl-dev=~3.0" --repository=http://dl-cdn.alpinelinux.org/alpine/v3.17/main
- name: Check LibSSL version
run: bin/crystal eval 'require "openssl"; p! LibSSL::OPENSSL_VERSION, LibSSL::LIBRESSL_VERSION'
- name: Run OpenSSL specs
run: bin/crystal spec --order=random spec/std/openssl/
openssl111:
runs-on: ubuntu-latest
name: "OpenSSL 1.1.1"
container: crystallang/crystal:1.12.1-alpine
container: crystallang/crystal:1.13.1-alpine
steps:
- name: Download Crystal source
uses: actions/checkout@v4
- name: Uninstall openssl
run: apk del openssl-dev
- name: Install openssl 1.1.1
run: apk add "openssl1.1-compat-dev=~1.1.1"
run: apk add "openssl1.1-compat-dev=~1.1.1" --repository=http://dl-cdn.alpinelinux.org/alpine/v3.18/community
- name: Check LibSSL version
run: bin/crystal eval 'require "openssl"; p! LibSSL::OPENSSL_VERSION, LibSSL::LIBRESSL_VERSION'
- name: Run OpenSSL specs
run: bin/crystal spec --order=random spec/std/openssl/
libressl34:
runs-on: ubuntu-latest
name: "LibreSSL 3.4"
container: crystallang/crystal:1.12.1-alpine
container: crystallang/crystal:1.13.1-alpine
steps:
- name: Download Crystal source
uses: actions/checkout@v4
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/regex-engine.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
pcre:
runs-on: ubuntu-latest
name: "PCRE"
container: crystallang/crystal:1.12.1-alpine
container: crystallang/crystal:1.13.1-alpine
steps:
- name: Download Crystal source
uses: actions/checkout@v4
Expand All @@ -25,7 +25,7 @@ jobs:
pcre2:
runs-on: ubuntu-latest
name: "PCRE2"
container: crystallang/crystal:1.12.1-alpine
container: crystallang/crystal:1.13.1-alpine
steps:
- name: Download Crystal source
uses: actions/checkout@v4
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/wasm32.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ env:
jobs:
wasm32-test:
runs-on: ubuntu-latest
container: crystallang/crystal:1.12.1-build
container: crystallang/crystal:1.13.1-build
steps:
- name: Download Crystal source
uses: actions/checkout@v4
Expand All @@ -22,14 +22,14 @@ jobs:
with:
wasmtime-version: "2.0.0"

- name: Install LLVM 13
- name: Install LLVM
run: |
apt-get update
apt-get install -y curl lsb-release wget software-properties-common gnupg
curl -O https://apt.llvm.org/llvm.sh
chmod +x llvm.sh
./llvm.sh 13
ln -s $(which wasm-ld-13) /usr/bin/wasm-ld
./llvm.sh 18
ln -s $(which wasm-ld-18) /usr/bin/wasm-ld
- name: Download wasm32 libs
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/win_build_portable.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
- name: Install Crystal
uses: crystal-lang/install-crystal@v1
with:
crystal: "1.12.1"
crystal: "1.13.1"

- name: Download Crystal source
uses: actions/checkout@v4
Expand Down
Loading

0 comments on commit b84a32b

Please sign in to comment.