Skip to content

Commit

Permalink
Merge branch 'master' into feature/tool-dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
straight-shoota committed Sep 26, 2023
2 parents fab9891 + 2d8ff9c commit c31885d
Show file tree
Hide file tree
Showing 188 changed files with 4,428 additions and 1,541 deletions.
4 changes: 2 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ parameters:
distribution-scripts-version:
description: "Git ref for version of https://github.com/crystal-lang/distribution-scripts/"
type: string
default: "4b3af3fb9ebeb2c74850bc7025a17a38ab82c5f4"
default: "e15cbd3b6b3e1bac1b16905f1b1a15ba6ae4e554"
previous_crystal_base_url:
description: "Prefix for URLs to Crystal bootstrap compiler"
type: string
default: "https://github.com/crystal-lang/crystal/releases/download/1.8.2/crystal-1.8.2-1"
default: "https://github.com/crystal-lang/crystal/releases/download/1.9.2/crystal-1.9.2-1"

defaults:
environment: &env
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/aarch64.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
if: github.repository == 'crystal-lang/crystal'
steps:
- name: Download Crystal source
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Build Crystal
uses: docker://jhass/crystal:1.0.0-alpine-build
with:
Expand All @@ -30,7 +30,7 @@ jobs:
if: github.repository == 'crystal-lang/crystal'
steps:
- name: Download Crystal source
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Download Crystal executable
uses: actions/download-artifact@v3
with:
Expand All @@ -47,7 +47,7 @@ jobs:
if: github.repository == 'crystal-lang/crystal'
steps:
- name: Download Crystal source
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Download Crystal executable
uses: actions/download-artifact@v3
with:
Expand All @@ -63,7 +63,7 @@ jobs:
if: github.repository == 'crystal-lang/crystal'
steps:
- name: Download Crystal source
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Build Crystal
uses: docker://jhass/crystal:1.0.0-build
with:
Expand All @@ -81,7 +81,7 @@ jobs:
if: github.repository == 'crystal-lang/crystal'
steps:
- name: Download Crystal source
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Download Crystal executable
uses: actions/download-artifact@v3
with:
Expand All @@ -98,7 +98,7 @@ jobs:
if: github.repository == 'crystal-lang/crystal'
steps:
- name: Download Crystal source
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Download Crystal executable
uses: actions/download-artifact@v3
with:
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/interpreter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,21 +13,21 @@ jobs:
test-interpreter_spec:
runs-on: ubuntu-22.04
container:
image: crystallang/crystal:1.8.2-build
image: crystallang/crystal:1.9.2-build
name: "Test Interpreter"
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Test interpreter_spec
run: make interpreter_spec junit_output=.junit/interpreter_spec.xml

build-interpreter:
runs-on: ubuntu-22.04
container:
image: crystallang/crystal:1.8.2-build
image: crystallang/crystal:1.9.2-build
name: Build interpreter
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Build compiler
run: make interpreter=1 release=1
Expand All @@ -43,13 +43,13 @@ jobs:
needs: build-interpreter
runs-on: ubuntu-22.04
container:
image: crystallang/crystal:1.8.2-build
image: crystallang/crystal:1.9.2-build
strategy:
matrix:
part: [0, 1, 2, 3]
name: "Test std_spec with interpreter (${{ matrix.part }})"
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Download compiler artifact
uses: actions/download-artifact@v3
Expand Down
14 changes: 8 additions & 6 deletions .github/workflows/linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,11 @@ jobs:
flags: ""
- crystal_bootstrap_version: 1.8.2
flags: ""
- crystal_bootstrap_version: 1.9.2
flags: ""
steps:
- name: Download Crystal source
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Prepare System
run: bin/ci prepare_system
Expand All @@ -51,7 +53,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Download Crystal source
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Prepare System
run: bin/ci prepare_system
Expand All @@ -69,7 +71,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Download Crystal source
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Prepare System
run: bin/ci prepare_system
Expand All @@ -90,7 +92,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Download Crystal source
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Prepare System
run: bin/ci prepare_system
Expand All @@ -109,7 +111,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Download Crystal source
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Prepare System
run: bin/ci prepare_system
Expand All @@ -124,7 +126,7 @@ jobs:
run: echo $GITHUB_SHA > ./docs/revision.txt

- name: Configure AWS Credentials
uses: aws-actions/configure-aws-credentials@v2
uses: aws-actions/configure-aws-credentials@v3
with:
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/llvm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
name: "LLVM ${{ matrix.llvm_version }}"
steps:
- name: Checkout Crystal source
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Cache LLVM
id: cache-llvm
Expand All @@ -54,7 +54,7 @@ jobs:
- name: Install Crystal
uses: crystal-lang/install-crystal@v1
with:
crystal: "1.8.2"
crystal: "1.9.2"

- name: Build libllvm_ext
run: make -B deps
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ env:

jobs:
x86_64-darwin-test:
runs-on: macos-11
runs-on: macos-13
steps:
- name: Download Crystal source
uses: actions/checkout@v3
uses: actions/checkout@v4

- uses: cachix/install-nix-action@v22
- uses: cachix/install-nix-action@v23
with:
install_url: https://releases.nixos.org/nix/nix-2.9.2/install
extra_nix_config: |
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/openssl.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ jobs:
openssl3:
runs-on: ubuntu-latest
name: "OpenSSL 3.0"
container: crystallang/crystal:1.8.2-alpine
container: crystallang/crystal:1.9.2-alpine
steps:
- name: Download Crystal source
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Uninstall openssl 1.1
run: apk del openssl-dev
- name: Upgrade alpine-keys
Expand All @@ -27,10 +27,10 @@ jobs:
openssl111:
runs-on: ubuntu-latest
name: "OpenSSL 1.1.1"
container: crystallang/crystal:1.8.2-alpine
container: crystallang/crystal:1.9.2-alpine
steps:
- name: Download Crystal source
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Uninstall openssl
run: apk del openssl-dev
- name: Install openssl 1.1.1
Expand All @@ -42,10 +42,10 @@ jobs:
libressl34:
runs-on: ubuntu-latest
name: "LibreSSL 3.4"
container: crystallang/crystal:1.8.2-alpine
container: crystallang/crystal:1.9.2-alpine
steps:
- name: Download Crystal source
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Uninstall openssl
run: apk del openssl-dev openssl-libs-static
- name: Upgrade alpine-keys
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/regex-engine.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ jobs:
pcre:
runs-on: ubuntu-latest
name: "PCRE"
container: crystallang/crystal:1.8.2-alpine
container: crystallang/crystal:1.9.2-alpine
steps:
- name: Download Crystal source
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Remove PCRE2
run: apk del pcre2-dev
- name: Assert using PCRE
Expand All @@ -25,10 +25,10 @@ jobs:
pcre2:
runs-on: ubuntu-latest
name: "PCRE2"
container: crystallang/crystal:1.8.2-alpine
container: crystallang/crystal:1.9.2-alpine
steps:
- name: Download Crystal source
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Assert using PCRE2
run: bin/crystal eval 'abort unless Regex::Engine == Regex::PCRE2'
- name: Assert select PCRE
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/smoke.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ jobs:

steps:
- name: Download Crystal source
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Build fresh compiler
run: bin/ci with_build_env make
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/wasm32.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ env:
jobs:
wasm32-test:
runs-on: ubuntu-latest
container: crystallang/crystal:1.8.2-build
container: crystallang/crystal:1.9.2-build
steps:
- name: Download Crystal source
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Install wasmtime
uses: mwilliamson/setup-wasmtime-action@v2
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/win.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
uses: ilammy/msvc-dev-cmd@cec98b9d092141f74527d0afa6feb2af698cfe89 # v1.12.1

- name: Download Crystal source
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Cache libraries
id: cache-libs
Expand Down Expand Up @@ -90,7 +90,7 @@ jobs:
uses: ilammy/msvc-dev-cmd@cec98b9d092141f74527d0afa6feb2af698cfe89 # v1.12.1

- name: Download Crystal source
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Cache libraries
id: cache-dlls
Expand Down Expand Up @@ -218,7 +218,7 @@ jobs:
uses: ilammy/msvc-dev-cmd@cec98b9d092141f74527d0afa6feb2af698cfe89 # v1.12.1

- name: Download Crystal source
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Download Crystal executable
uses: actions/download-artifact@v3
Expand Down Expand Up @@ -252,14 +252,14 @@ jobs:
run: make -f Makefile.win samples

x86_64-windows-release:
if: github.repository_owner == 'crystal-lang' && (startsWith(github.ref, 'refs/heads/release/') || startsWith(github.ref, 'refs/heads/ci/'))
if: github.repository_owner == 'crystal-lang' && (startsWith(github.ref, 'refs/tags/') || startsWith(github.ref, 'refs/heads/ci/'))
needs: [x86_64-windows-libs, x86_64-windows-dlls, x86_64-windows-llvm]
uses: ./.github/workflows/win_build_portable.yml
with:
release: true

x86_64-windows-installer:
if: github.repository_owner == 'crystal-lang' && (startsWith(github.ref, 'refs/heads/release/') || startsWith(github.ref, 'refs/heads/ci/'))
if: github.repository_owner == 'crystal-lang' && (startsWith(github.ref, 'refs/tags/') || startsWith(github.ref, 'refs/heads/ci/'))
runs-on: windows-2022
needs: [x86_64-windows-release]
steps:
Expand All @@ -268,7 +268,7 @@ jobs:
git config --global core.autocrlf false
- name: Download Crystal source
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Download Crystal executable
uses: actions/download-artifact@v3
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/win_build_portable.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ jobs:
- name: Install Crystal
uses: crystal-lang/install-crystal@v1
with:
crystal: "1.8.2"
crystal: "1.9.2"

- name: Download Crystal source
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Restore libraries
uses: actions/cache/restore@v3
Expand Down Expand Up @@ -105,14 +105,14 @@ jobs:
make -f Makefile.win -B ${{ inputs.release && 'release=1' || '' }}
- name: Download shards release
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
repository: crystal-lang/shards
ref: v0.17.3
path: shards

- name: Download molinillo release
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
repository: crystal-lang/crystal-molinillo
ref: v0.2.0
Expand Down
Loading

0 comments on commit c31885d

Please sign in to comment.