Skip to content
This repository has been archived by the owner on Feb 8, 2024. It is now read-only.

Bump nixpkgs to latest to update crystal version #847

Merged
merged 2 commits into from
Apr 25, 2023
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
6 changes: 3 additions & 3 deletions .github/workflows/ci-crystal.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
2 changes: 1 addition & 1 deletion .github/workflows/lint-definition.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions shell.nix
Original file line number Diff line number Diff line change
@@ -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
Expand Down