From e53e2d7512f77d0d475cd215b8e5678ca2b5002c Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Tue, 25 Apr 2023 19:12:10 +0900 Subject: [PATCH] Bump nixpkgs to latest to update crystal version (#847) * Bump nixpkgs to latest to update crystal version * Bump cache key (Honestly, this should use variable...) --- .github/workflows/ci-crystal.yml | 6 +++--- .github/workflows/lint-definition.yml | 2 +- shell.nix | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci-crystal.yml b/.github/workflows/ci-crystal.yml index 9e09a3b8..cacaf00a 100644 --- a/.github/workflows/ci-crystal.yml +++ b/.github/workflows/ci-crystal.yml @@ -26,7 +26,7 @@ jobs: - uses: actions/checkout@v3 - uses: crystal-lang/install-crystal@v1 with: - crystal: '1.7.3' + crystal: '1.8.1' # Need node.js to install validator. Spec includes the validator runner - run: crystal spec --tag '~needs_npm' lint: @@ -39,10 +39,10 @@ jobs: uses: actions/cache@v3 with: path: ./bin/ameba - key: ameba-${{ runner.os }}-crystal_1.7.1-${{ hashFiles('shard.lock') }} + key: ameba-${{ runner.os }}-crystal_1.8.1-${{ hashFiles('shard.lock') }} - uses: crystal-lang/install-crystal@v1 with: - crystal: '1.7.3' + crystal: '1.8.1' - run: shards install if: steps.cache.outputs.cache-hit != 'true' - run: make crystal-lint-check diff --git a/.github/workflows/lint-definition.yml b/.github/workflows/lint-definition.yml index f4d70191..2d63f7fb 100644 --- a/.github/workflows/lint-definition.yml +++ b/.github/workflows/lint-definition.yml @@ -19,6 +19,6 @@ jobs: - uses: actions/checkout@v3 - uses: crystal-lang/install-crystal@v1 with: - crystal: '1.7.3' + crystal: '1.8.1' - run: shards install --production - run: crystal run src/cli.cr -- lint diff --git a/shell.nix b/shell.nix index e60b0b3f..2ca99ad4 100644 --- a/shell.nix +++ b/shell.nix @@ -1,9 +1,9 @@ -{ pkgs ? import (fetchTarball "https://github.com/NixOS/nixpkgs/archive/4c3edba85629ec304b5269e4b0ac7f26c433df23.tar.gz") { } }: +{ pkgs ? import (fetchTarball "https://github.com/NixOS/nixpkgs/archive/f3f15fa73ddf15fa66cc4f80cda4c5afb356306b.tar.gz") { } }: pkgs.mkShell { buildInputs = [ pkgs.nodejs-18_x - pkgs.crystal_1_7 + pkgs.crystal_1_8 pkgs.shards pkgs.dprint pkgs.nil