From f2f339db8811b8ff1169bade79abc77027e83142 Mon Sep 17 00:00:00 2001 From: sommerfeld Date: Thu, 17 Sep 2026 15:05:35 +0100 Subject: Run CI checks with the Nix development shell --- .github/workflows/check.yml | 47 +++------------------- .../waybar/executable_notification-picker.py | 0 just-lib.sh | 2 +- 3 files changed, 6 insertions(+), 43 deletions(-) mode change 100644 => 100755 dot_config/waybar/executable_notification-picker.py diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index 1ba15e6..0a15f83 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -12,49 +12,12 @@ jobs: steps: - uses: actions/checkout@v4 - - uses: extractions/setup-just@v3 - - - name: Install apt tooling (shfmt, shellcheck) - run: | - sudo apt-get update -qq - sudo apt-get install -y --no-install-recommends shfmt shellcheck - - - name: Install ruff - run: pipx install ruff - - - name: Install basedpyright - run: pipx install basedpyright - - - name: Install prettier - run: npm install -g prettier@3 - - - name: Install stylua - run: | - set -euo pipefail - url=$(curl -fsSL https://api.github.com/repos/JohnnyMorganz/StyLua/releases/latest \ - | grep -Eo 'https://[^"]+stylua-linux-x86_64\.zip' | head -1) - curl -fsSL "$url" -o /tmp/stylua.zip - unzip -q /tmp/stylua.zip -d /tmp - sudo install -m 0755 /tmp/stylua /usr/local/bin/stylua - - - name: Install selene - run: | - set -euo pipefail - url=$(curl -fsSL https://api.github.com/repos/Kampfkarren/selene/releases/latest \ - | grep -Eo 'https://[^"]+selene-light-[^"]+-linux\.zip' | head -1) - curl -fsSL "$url" -o /tmp/selene.zip - unzip -q /tmp/selene.zip -d /tmp - sudo install -m 0755 /tmp/selene /usr/local/bin/selene - - - name: Install taplo - run: | - set -euo pipefail - curl -fsSL https://github.com/tamasfe/taplo/releases/latest/download/taplo-linux-x86_64.gz \ - | gunzip > /tmp/taplo - sudo install -m 0755 /tmp/taplo /usr/local/bin/taplo + - uses: cachix/install-nix-action@v31 + with: + github_access_token: ${{ secrets.GITHUB_TOKEN }} - name: just doctor - run: just doctor + run: nix develop ./nix --command just doctor - name: just check - run: just check + run: nix develop ./nix --command just check diff --git a/dot_config/waybar/executable_notification-picker.py b/dot_config/waybar/executable_notification-picker.py old mode 100644 new mode 100755 diff --git a/just-lib.sh b/just-lib.sh index 47cceb3..1846c26 100644 --- a/just-lib.sh +++ b/just-lib.sh @@ -37,7 +37,7 @@ _is_zsh() { } _is_shellscript() { - head -1 "$1" 2>/dev/null | grep -qE '^#!.*\b(ba)?sh\b' + head -1 "$1" 2>/dev/null | grep -qE '^#!.*[/[:space:]](ba|da)?sh([[:space:]]|$)' } _flatpak_install_declared() { -- cgit v1.3.1