Redo integration tests

.github/workflows/unit-tests.yml

@@ -7,13 +7,16 @@ on:
   pull_request:
     branches: [main]
   workflow_dispatch:
+
 concurrency:
   group: ${{ github.workflow }}-${{ github.event_name == 'pull_request' && github.head_ref || github.sha }}
   cancel-in-progress: true
+
 env:
   CARGO_TERM_COLOR: always
   RUSTFLAGS: --deny warnings
   msrv: '1.90'
+
 jobs:
   security_audit:
     runs-on: ubuntu-latest
@@ -22,6 +25,7 @@ jobs:
       - uses: taiki-e/install-action@cargo-deny
       - name: Scan for vulnerabilities
         run: cargo deny check
+
   check_if_pr:
     runs-on: ubuntu-latest
     outputs:
@@ -35,6 +39,7 @@ jobs:
           else
             echo "is_pr=false" >> $GITHUB_OUTPUT
           fi
+
   no-merge-commits:
     needs: check_if_pr
     if: needs.check_if_pr.outputs.is_pr == 'true'
@@ -46,21 +51,22 @@ jobs:
         uses: NexusPHP/no-merge-commits@v2.2.1
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
+
   conventional:
     needs: [check_if_pr, no-merge-commits]
     name: Conventional Commits
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v6
       - uses: webiny/action-conventional-commits@v1.3.0
+
   unit-tests:
-    needs: conventional
     runs-on: ${{ matrix.os }}
     continue-on-error: ${{ matrix.rust == 'nightly' }}
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-        rust: [msrv, stable, beta, nightly]
+        rust: [msrv, stable]
     steps:
       - name: Checkout repository
         uses: actions/checkout@v6
@@ -78,15 +84,15 @@ jobs:
         if: ${{ matrix.os != 'windows-latest' }}
         run: cargo clippy -- -D warnings
       - name: Run unit tests
-        run: cargo hack test
+        run: cargo hack test -- --skip cli_tests
+
   unit-tests-freebsd:
-    needs: conventional
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     timeout-minutes: 20
     continue-on-error: ${{ matrix.rust == 'nightly' }}
     strategy:
       matrix:
-        rust: [msrv, stable, beta, nightly]
+        rust: [msrv, stable]
     steps:
       - uses: actions/checkout@v6
         with:
@@ -109,15 +115,15 @@ jobs:
             export RUSTFLAGS="--deny warnings"
             cargo fmt --check
             cargo clippy -- -D warnings
-            cargo hack test
+            cargo hack test -- --skip cli_tests
+
   unit-tests-netbsd:
-    needs: conventional
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     timeout-minutes: 20
     continue-on-error: ${{ matrix.rust == 'nightly' }}
     strategy:
       matrix:
-        rust: [msrv, stable, beta, nightly]
+        rust: [msrv, stable]
     steps:
       - uses: actions/checkout@v6
         with:
@@ -143,10 +149,10 @@ jobs:
             export RUSTFLAGS="--deny warnings"
             cargo fmt --check
             cargo clippy -- -D warnings
-            cargo hack test
+            cargo hack test -- --skip cli_tests
+
   unit-tests-openbsd:
-    needs: conventional
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     timeout-minutes: 20
     steps:
       - uses: actions/checkout@v6
@@ -170,36 +176,17 @@ jobs:
             # export RUSTFLAGS="--deny warnings"
             cargo fmt --check
             # cargo clippy -- -D warnings
-            cargo hack test
-  flake-check:
-    needs: conventional
-    name: Check Nix Flake
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        checks: [build, formatting, lint, pre-commit-check, test, trycmd]
-        target: [x86_64-linux]
-    steps:
-      - uses: actions/checkout@v6
-      - name: Install Nix
-        uses: DeterminateSystems/nix-installer-action@v17
-      - name: Nix Flake Check
-        run: nix build .#checks.${{ matrix.target }}.${{ matrix.checks }} -L
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-  flake-build:
-    needs: conventional
-    name: Build Nix package
-    # if cross compilation is desired add 'aarch64-linux', 'x86_64-darwin' and 'aarch64-darwin' and fix the flake to support cross compilation.
-    strategy:
-      matrix:
-        target: [x86_64-linux]
-    runs-on: ubuntu-latest
+            cargo hack test -- --skip cli_tests
+
+  integration-tests-unix:
+    runs-on: ubuntu-22.04
+    timeout-minutes: 20
     steps:
-      - uses: actions/checkout@v6
-      - name: Install Nix
-        uses: DeterminateSystems/nix-installer-action@v17
-      - name: Nix Build
-        run: nix build .#packages.${{ matrix.target }}.default -L
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - name: Checkout repository
+        uses: actions/checkout@v6
+
+      - name: Install test dependencies
+        uses: extractions/setup-just@v4
+
+      - name: Run integration tests
+        run: just integration-tests

.gitignore

@@ -1,27 +1,15 @@
 # SPDX-FileCopyrightText: 2024 Christina Sørensen
 # SPDX-License-Identifier: EUPL-1.2
-# Nix Flake stuff
-result
-
-# Generated by nix-pre-commit-hooks
-/.pre-commit-config.yaml
-
-# Direnv
-.direnv
-
 # Rust stuff
-target
+/target
 
-# Vagrant stuff
-.vagrant
-*.log
+## Dynamically generated test data
+/tests/data
 
 # Compiled artifacts
 # (see devtools/*-package-for-*.sh)
-/eza-linux-x86_64
-/eza-linux-x86_64-*.zip
-/eza-macos-x86_64
-/eza-macos-x86_64-*.zip
+/eza-*-x86_64
+/eza-*-x86_64-*.zip
 /eza_*.deb
 /MD5SUMS
 /SHA1SUMS
@@ -31,13 +19,3 @@ parts
 prime
 stage
 *.snap
-
-# VHS testing stuff
-out.gif
-tests/tmp
-
-## Dynamically generated
-tests/test_dir
-
-# Miscenallous
-.idea

CHANGELOG.md

@@ -16,7 +16,7 @@ SPDX-License-Identifier: EUPL-1.2
 
 ### Documentation
 
-- Corrected "user_executable_file" option 
+- Corrected "user_executable_file" option
 
 ### Features
 
@@ -2682,7 +2682,7 @@ SPDX-License-Identifier: EUPL-1.2
 - Add selinux contexts support
 - Add -o shorcut to --octal-permissions
 - Hyperlink flag
-- Update Cargo.toml to optimise binaries for size 
+- Update Cargo.toml to optimise binaries for size
 - Add git-status-.* completions
 - Zsh add git-status-.* completions
 - Add git-status-.* completions
@@ -2818,5 +2818,3 @@ SPDX-License-Identifier: EUPL-1.2
 ### Vagrant
 
 - Update apt before installing
-
-