Merge branch 'master' into gzipcheckhcrc

crystal-lang · Aug 21, 2024 · 36308e8 · 36308e8
2 parents 59aa673 + 4570027
commit 36308e8
Show file tree

Hide file tree

Showing 136 changed files with 2,828 additions and 995 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -8,11 +8,11 @@ parameters:
   distribution-scripts-version:
     description: "Git ref for version of https://github.com/crystal-lang/distribution-scripts/"
     type: string
-    default: "96e431e170979125018bd4fd90111a3147477eec"
+    default: "da59efb2dfd70dcd7272eaecceffb636ef547427"
   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.2/crystal-1.12.2-1"
+    default: "https://github.com/crystal-lang/crystal/releases/download/1.13.1/crystal-1.13.1-1"
 
 defaults:
   environment: &env
@@ -81,7 +81,7 @@ jobs:
 
   test_darwin:
     macos:
-      xcode: 13.4.1
+      xcode: 15.4.0
     environment:
       <<: *env
       TRAVIS_OS_NAME: osx

diff --git a/.github/workflows/interpreter.yml b/.github/workflows/interpreter.yml
@@ -13,7 +13,7 @@ jobs:
   test-interpreter_spec:
     runs-on: ubuntu-22.04
     container:
-      image: crystallang/crystal:1.12.2-build
+      image: crystallang/crystal:1.13.1-build
     name: "Test Interpreter"
     steps:
       - uses: actions/checkout@v4
@@ -24,7 +24,7 @@ jobs:
   build-interpreter:
     runs-on: ubuntu-22.04
     container:
-      image: crystallang/crystal:1.12.2-build
+      image: crystallang/crystal:1.13.1-build
     name: Build interpreter
     steps:
       - uses: actions/checkout@v4
@@ -43,7 +43,7 @@ jobs:
     needs: build-interpreter
     runs-on: ubuntu-22.04
     container:
-      image: crystallang/crystal:1.12.2-build
+      image: crystallang/crystal:1.13.1-build
     strategy:
       matrix:
         part: [0, 1, 2, 3]
@@ -67,7 +67,7 @@ jobs:
     needs: build-interpreter
     runs-on: ubuntu-22.04
     container:
-      image: crystallang/crystal:1.12.2-build
+      image: crystallang/crystal:1.13.1-build
     name: "Test primitives_spec with interpreter"
     steps:
       - uses: actions/checkout@v4

diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -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.2]
+        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

diff --git a/.github/workflows/llvm.yml b/.github/workflows/llvm.yml
@@ -58,7 +58,7 @@ jobs:
       - name: Install Crystal
         uses: crystal-lang/install-crystal@v1
         with:
-          crystal: "1.12.2"
+          crystal: "1.13.1"
 
       - name: Build libllvm_ext
         run: make -B deps

diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -11,18 +11,26 @@ env:
   CI_NIX_SHELL: true
 
 jobs:
-  x86_64-darwin-test:
-    runs-on: macos-13
+  darwin-test:
+    runs-on: ${{ matrix.runs-on }}
+    name: ${{ matrix.arch }}
+    strategy:
+      matrix:
+        include:
+        - runs-on: macos-13
+          arch: x86_64-darwin
+        - runs-on: macos-14
+          arch: aarch64-darwin
     steps:
       - name: Download Crystal source
         uses: actions/checkout@v4
 
-      - uses: cachix/install-nix-action@v26
+      - uses: cachix/install-nix-action@v27
         with:
           install_url: https://releases.nixos.org/nix/nix-2.9.2/install
           extra_nix_config: |
             experimental-features = nix-command
-      - uses: cachix/cachix-action@v14
+      - uses: cachix/cachix-action@v15
         with:
           name: crystal-ci
           signingKey: '${{ secrets.CACHIX_SIGNING_KEY }}'

diff --git a/.github/workflows/openssl.yml b/.github/workflows/openssl.yml
@@ -7,52 +7,34 @@ concurrency:
   cancel-in-progress: ${{ github.ref != 'refs/heads/master' }}
 
 jobs:
-  openssl3:
+  libssl_test:
     runs-on: ubuntu-latest
-    name: "OpenSSL 3.0"
-    container: crystallang/crystal:1.12.2-alpine
+    name: "${{ matrix.pkg }}"
+    container: crystallang/crystal:1.13.1-alpine
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - pkg: "openssl1.1-compat-dev=~1.1.1"
+            repository: http://dl-cdn.alpinelinux.org/alpine/v3.18/community
+          - pkg: "openssl-dev=~3.0"
+            repository: http://dl-cdn.alpinelinux.org/alpine/v3.17/main
+          - pkg: "openssl-dev=~3.3"
+            repository: http://dl-cdn.alpinelinux.org/alpine/v3.20/main
+          - pkg: "libressl-dev=~3.4"
+            repository: http://dl-cdn.alpinelinux.org/alpine/v3.15/community
+          - pkg: "libressl-dev=~3.5"
+            repository: http://dl-cdn.alpinelinux.org/alpine/v3.16/community
+          - pkg: "libressl-dev=~3.8"
+            repository: http://dl-cdn.alpinelinux.org/alpine/v3.20/community
     steps:
       - name: Download Crystal source
         uses: actions/checkout@v4
-      - name: Uninstall openssl 1.1
-        run: apk del openssl-dev
-      - name: Upgrade alpine-keys
-        run: apk upgrade alpine-keys
-      - name: Install openssl 3.0
-        run: apk add "openssl-dev=~3.0"
-      - 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.2-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"
-      - 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.2-alpine
-    steps:
-      - name: Download Crystal source
-        uses: actions/checkout@v4
-      - name: Uninstall openssl
-        run: apk del openssl-dev openssl-libs-static
-      - name: Upgrade alpine-keys
-        run: apk upgrade alpine-keys
-      - name: Install libressl 3.4
-        run: apk add "libressl-dev=~3.4" --repository=http://dl-cdn.alpinelinux.org/alpine/v3.15/community
-      - name: Check LibSSL version
+      - name: Uninstall openssl and conflicts
+        run: apk del openssl-dev openssl-libs-static libxml2-static
+      - name: Install ${{ matrix.pkg }}
+        run: apk add "${{ matrix.pkg }}" --repository=${{ matrix.repository }}
+      - name: Print 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/
diff --git a/.github/workflows/regex-engine.yml b/.github/workflows/regex-engine.yml
@@ -10,7 +10,7 @@ jobs:
   pcre:
     runs-on: ubuntu-latest
     name: "PCRE"
-    container: crystallang/crystal:1.12.2-alpine
+    container: crystallang/crystal:1.13.1-alpine
     steps:
       - name: Download Crystal source
         uses: actions/checkout@v4
@@ -25,7 +25,7 @@ jobs:
   pcre2:
     runs-on: ubuntu-latest
     name: "PCRE2"
-    container: crystallang/crystal:1.12.2-alpine
+    container: crystallang/crystal:1.13.1-alpine
     steps:
       - name: Download Crystal source
         uses: actions/checkout@v4

diff --git a/.github/workflows/smoke.yml b/.github/workflows/smoke.yml
@@ -51,7 +51,6 @@ jobs:
       matrix:
         target:
           - aarch64-linux-android
-          - aarch64-darwin
           - arm-linux-gnueabihf
           - i386-linux-gnu
           - i386-linux-musl

diff --git a/.github/workflows/wasm32.yml b/.github/workflows/wasm32.yml
@@ -12,7 +12,7 @@ env:
 jobs:
   wasm32-test:
     runs-on: ubuntu-latest
-    container: crystallang/crystal:1.12.2-build
+    container: crystallang/crystal:1.13.1-build
     steps:
       - name: Download Crystal source
         uses: actions/checkout@v4
@@ -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: |

diff --git a/.github/workflows/win_build_portable.yml b/.github/workflows/win_build_portable.yml
@@ -24,7 +24,7 @@ jobs:
       - name: Install Crystal
         uses: crystal-lang/install-crystal@v1
         with:
-          crystal: "1.12.2"
+          crystal: "1.13.1"
 
       - name: Download Crystal source
         uses: actions/checkout@v4