Merge pull request #1026 from kachick/update-nixpath

Update nixpath

.github/workflows/ci-crystal.yml

@@ -26,23 +26,17 @@ jobs:
       - uses: actions/checkout@v3
       - uses: crystal-lang/install-crystal@v1
         with:
-          crystal: '1.8.1'
+          # Keep same version as used in *.nix
+          crystal: '1.9.0'
+          shards: '0.17.3'
       # Need node.js to install validator. Spec includes the validator runner
       - run: crystal spec --tag '~needs_npm'
   lint:
     timeout-minutes: 5
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - name: Cache ameba
-        id: cache
-        uses: actions/cache@v3
-        with:
-          path: ./bin/ameba
-          key: ameba-${{ runner.os }}-crystal_1.8.1-${{ hashFiles('shard.lock') }}
-      - uses: crystal-lang/install-crystal@v1
-        with:
-          crystal: '1.8.1'
-      - run: shards install
-        if: steps.cache.outputs.cache-hit != 'true'
-      - run: make crystal-lint-check
+      - name: Crystal Ameba Linter
+        uses: crystal-ameba/github-action@v0.7.1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/ci-nix.yml

@@ -29,7 +29,7 @@ jobs:
       - uses: DeterminateSystems/magic-nix-cache-action@v2
       - run: nix-shell --run 'echo This step should be done before any other "nix-shell" steps because of measuring Nix build time'
       - name: Log current versions
-        run: nix-shell --run 'make versions'
+        run: nix-shell --run 'make deps'
       - run: nix-shell --run 'make setup'
       - name: Run linters
         run: nix-shell --run 'make check'

.github/workflows/ci-official.yml

@@ -28,7 +28,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
-          node-version: '18.15.0'
+          node-version-file: '.node-version'
           cache: npm
       - run: npm ci
       # renovate.json will always tested by the CLI

.github/workflows/ci-typescript.yml

@@ -26,7 +26,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
-          node-version: '18.x'
+          node-version-file: '.node-version'
           cache: npm
       - run: npm ci
       - run: npx tsc

.github/workflows/lint-common.yml

@@ -16,6 +16,9 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - uses: dprint/check@v2.2
+        with:
+          # Keep same version as used in *.nix
+          dprint-version: '0.37.1'
 
   typos:
     timeout-minutes: 5

.github/workflows/lint-definition.yml

@@ -21,6 +21,8 @@ jobs:
       - uses: actions/checkout@v3
       - uses: crystal-lang/install-crystal@v1
         with:
-          crystal: '1.8.1'
+          # Keep same version as used in *.nix
+          crystal: '1.9.0'
+          shards: '0.17.3'
       - run: shards install --production
       - run: crystal run src/cli.cr -- lint

.node-version

@@ -0,0 +1 @@
+18.16.1

.vscode/settings.json

@@ -5,11 +5,15 @@
   "[nix]": {
     "editor.defaultFormatter": "jnoortheen.nix-ide"
   },
+  "[crystal]": {
+    "editor.defaultFormatter": "crystal-lang-tools.crystal-lang"
+  },
   "nix.serverPath": "nil",
   "nix.enableLanguageServer": true,
   "nix.serverSettings": {
     "nil": {
       "formatting": { "command": ["nixpkgs-fmt"] }
     }
-  }
+  },
+  "crystal-lang.server": "/nix/store/pj2wfyhfgac9lb2c9lwp85294hx4lkpg-crystalline-0.10.0/bin/crystalline"
 }

Makefile

@@ -47,7 +47,7 @@ lint-definitions:
 lint-all: crystal-lint-check dprint-check lint-definitions eslint-check typos-check
 
 crystal-lint-check: crystal-format-check
-	./bin/ameba --except Metrics
+	ameba --except Metrics
 
 .PHONY: crystal-format-check
 crystal-format-check:
@@ -62,7 +62,7 @@ lint-fix-all: crystal-lint-fix dprint-fix eslint-fix
 .PHONY: crystal-lint-fix
 crystal-lint-fix:
 	crystal tool format
-	./bin/ameba --except Metrics --fix
+	ameba --except Metrics --fix
 
 .PHONY: eslint-check
 eslint-check:
@@ -85,7 +85,7 @@ touch:
 	./bin/cli touch
 
 .PHONY: versions
-versions:
+deps:
 	nix --version
 	node --version
 	crystal --version

default.nix

@@ -1,14 +1,19 @@
-{ pkgs ? import (fetchTarball "https://github.com/NixOS/nixpkgs/archive/e57b65abbbf7a2d5786acc86fdf56cde060ed026.tar.gz") { } }:
+{ pkgs ? import (fetchTarball "https://github.com/NixOS/nixpkgs/archive/19a336ffabcd7d77cb3d55fa890ab64e7c4ac3f3.tar.gz") { } }:
 
 pkgs.mkShell {
   buildInputs = [
     pkgs.nodejs-18_x
-    pkgs.crystal_1_8
-    pkgs.shards
     pkgs.dprint
     pkgs.nil
     pkgs.nixpkgs-fmt
-    pkgs.pcre
     pkgs.typos
+
+    # Section for crystal
+    pkgs.crystal
+    pkgs.shards
+    # Used in crystal
+    pkgs.pcre
+    pkgs.crystalline
+    pkgs.ameba
   ];
 }

shard.yml

@@ -12,10 +12,10 @@ authors:
 #     github: will/crystal-pg
 #     version: "~> 0.5"
 
-development_dependencies:
-  ameba:
-    github: crystal-ameba/ameba
-    version: ~> 1.4.3
+# development_dependencies:
+#   ameba:
+#     github: crystal-ameba/ameba
+#     version: ~> 1.4.3
 
 license: MIT