Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions .github/workflows/macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,21 @@ concurrency:
env:
SPEC_SPLIT_DOTS: 160
CI_NIX_SHELL: true
CRYSTAL_OPTS: -Dwithout_iconv

jobs:
darwin-test:
runs-on: ${{ matrix.runs-on }}
name: ${{ matrix.arch }}
strategy:
fail-fast: false
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
Expand Down
3 changes: 2 additions & 1 deletion bin/ci
Original file line number Diff line number Diff line change
Expand Up @@ -213,6 +213,7 @@ with_build_env() {
-e CRYSTAL_CACHE_DIR="/tmp/crystal" \
-e SPEC_SPLIT_DOTS \
-e USE_PCRE1 \
-e CRYSTAL_OPTS \
"$DOCKER_TEST_IMAGE" \
"$ARCH_CMD" /bin/sh -c "'$command'"

Expand All @@ -222,7 +223,7 @@ with_build_env() {
CRYSTAL_CACHE_DIR="/tmp/crystal" \
/bin/sh -c "'$command'"

on_nix_shell nix-shell --pure $CI_NIX_SHELL_ARGS --run "'TZ=$TZ $command'"
on_nix_shell nix-shell --pure $CI_NIX_SHELL_ARGS --keep CRYSTAL_OPTS --run "'TZ=$TZ $command'"

on_github echo "::endgroup::"
}
Expand Down
8 changes: 4 additions & 4 deletions shell.nix
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,13 @@
# $ nix-shell --pure --arg musl true
#

{llvm ? 11, musl ? false, system ? builtins.currentSystem}:
{llvm ? 18, musl ? false, system ? builtins.currentSystem}:

let
nixpkgs = import (builtins.fetchTarball {
name = "nixpkgs-23.05";
url = "https://github.com/NixOS/nixpkgs/archive/23.05.tar.gz";
sha256 = "10wn0l08j9lgqcw8177nh2ljrnxdrpri7bp0g7nvrsn9rkawvlbf";
name = "nixpkgs-24.05";
url = "https://github.com/NixOS/nixpkgs/archive/24.05.tar.gz";
sha256 = "1lr1h35prqkd1mkmzriwlpvxcb34kmhc9dnr48gkm8hh089hifmx";
}) {
inherit system;
};
Expand Down