Skip to content

Commit

Permalink
Merge branch 'master' into nobody/sanitize-docs
Browse files Browse the repository at this point in the history
  • Loading branch information
nobodywasishere authored May 2, 2024
2 parents e2554da + 7ecb968 commit 5b36e85
Show file tree
Hide file tree
Showing 128 changed files with 3,237 additions and 989 deletions.
4 changes: 2 additions & 2 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: "535aedb8b09d77caaa1583700f371cd04343b7e8"
default: "46c295d14e4dc3f6b7d9598c0b4dd89e93232def"
previous_crystal_base_url:
description: "Prefix for URLs to Crystal bootstrap compiler"
type: string
default: "https://github.com/crystal-lang/crystal/releases/download/1.11.2/crystal-1.11.2-1"
default: "https://github.com/crystal-lang/crystal/releases/download/1.12.1/crystal-1.12.1-1"

defaults:
environment: &env
Expand Down
27 changes: 24 additions & 3 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.11.2-build
image: crystallang/crystal:1.12.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.11.2-build
image: crystallang/crystal:1.12.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.11.2-build
image: crystallang/crystal:1.12.1-build
strategy:
matrix:
part: [0, 1, 2, 3]
Expand All @@ -62,3 +62,24 @@ jobs:

- name: Run std_spec with interpreter
run: SPEC_SPLIT="${{ matrix.part }}%4" bin/crystal i spec/std_spec.cr -- --junit_output .junit/interpreter-std_spec.${{ matrix.part }}.xml

test-interpreter-primitives_spec:
needs: build-interpreter
runs-on: ubuntu-22.04
container:
image: crystallang/crystal:1.11.2-build
name: "Test primitives_spec with interpreter"
steps:
- uses: actions/checkout@v4

- name: Download compiler artifact
uses: actions/download-artifact@v4
with:
name: crystal-interpreter
path: .build/

- name: Mark downloaded compiler as executable
run: chmod +x .build/crystal

- name: Run primitives_spec with interpreter
run: bin/crystal i spec/primitives_spec.cr -- --junit_output .junit/interpreter-primitives_spec.xml
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]
crystal_bootstrap_version: [1.7.3, 1.8.2, 1.9.2, 1.10.1, 1.11.2, 1.12.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 @@ -56,7 +56,7 @@ jobs:
- name: Install Crystal
uses: crystal-lang/install-crystal@v1
with:
crystal: "1.11.2"
crystal: "1.12.1"

- name: Build libllvm_ext
run: make -B deps
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/openssl.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
openssl3:
runs-on: ubuntu-latest
name: "OpenSSL 3.0"
container: crystallang/crystal:1.11.2-alpine
container: crystallang/crystal:1.12.1-alpine
steps:
- name: Download Crystal source
uses: actions/checkout@v4
Expand All @@ -27,7 +27,7 @@ jobs:
openssl111:
runs-on: ubuntu-latest
name: "OpenSSL 1.1.1"
container: crystallang/crystal:1.11.2-alpine
container: crystallang/crystal:1.12.1-alpine
steps:
- name: Download Crystal source
uses: actions/checkout@v4
Expand All @@ -42,7 +42,7 @@ jobs:
libressl34:
runs-on: ubuntu-latest
name: "LibreSSL 3.4"
container: crystallang/crystal:1.11.2-alpine
container: crystallang/crystal:1.12.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.11.2-alpine
container: crystallang/crystal:1.12.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.11.2-alpine
container: crystallang/crystal:1.12.1-alpine
steps:
- name: Download Crystal source
uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion .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.11.2-build
container: crystallang/crystal:1.12.1-build
steps:
- name: Download Crystal source
uses: actions/checkout@v4
Expand Down
11 changes: 3 additions & 8 deletions .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.11.2"
crystal: "1.12.1"

- name: Download Crystal source
uses: actions/checkout@v4
Expand Down Expand Up @@ -114,13 +114,7 @@ jobs:
- name: Build Crystal
run: |
bin/crystal.bat env
# TODO: the 1.11.2 compiler only understands `-Dpreview_dll`; remove this once the
# base compiler is updated
make -f Makefile.win -B FLAGS=-Dpreview_dll ${{ inputs.release && 'release=1' || '' }}
# TODO: 1.11.2 comes with LLVM 17's DLL and copies it to the output directory, but a
# dynamically linked compiler requires LLVM 18, so we must overwrite it; remove this
# line once the base compiler is updated
cp dlls/LLVM-C.dll .build/
make -f Makefile.win -B ${{ inputs.release && 'release=1' || '' }}
- name: Download shards release
uses: actions/checkout@v4
Expand All @@ -138,6 +132,7 @@ jobs:
make -f Makefile.win install prefix=crystal
mkdir crystal/lib
cp shards/bin/shards.exe crystal/
cp shards/bin/shards.pdb crystal/
cp libs/* crystal/lib/
cp dlls/* crystal/
cp README.md crystal/
Expand Down
Loading

0 comments on commit 5b36e85

Please sign in to comment.