diff --git a/.gitea/workflows/release.yml b/.gitea/workflows/release.yml index ac263704..134d8bd1 100644 --- a/.gitea/workflows/release.yml +++ b/.gitea/workflows/release.yml @@ -14,7 +14,7 @@ jobs: uses: actions/checkout@v4 - name: Build for release - run: nix build --print-out-paths --print-build-logs .#dist + run: nix build --print-out-paths --print-build-logs ./test#dist - name: Release uses: https://gitea.com/actions/release-action@main diff --git a/.gitea/workflows/test.yml b/.gitea/workflows/test.yml index 7066d0d4..d1fc7ef8 100644 --- a/.gitea/workflows/test.yml +++ b/.gitea/workflows/test.yml @@ -12,7 +12,7 @@ jobs: uses: actions/checkout@v4 - name: Run NixOS test - run: nix build --out-link "result" --print-out-paths --print-build-logs .#checks.x86_64-linux.hakurei + run: nix build --out-link "result" --print-out-paths --print-build-logs ./test#checks.x86_64-linux.hakurei - name: Upload test output uses: actions/upload-artifact@v3 @@ -29,7 +29,7 @@ jobs: uses: actions/checkout@v4 - name: Run NixOS test - run: nix build --out-link "result" --print-out-paths --print-build-logs .#checks.x86_64-linux.race + run: nix build --out-link "result" --print-out-paths --print-build-logs ./test#checks.x86_64-linux.race - name: Upload test output uses: actions/upload-artifact@v3 @@ -46,7 +46,7 @@ jobs: uses: actions/checkout@v4 - name: Run NixOS test - run: nix build --out-link "result" --print-out-paths --print-build-logs .#checks.x86_64-linux.sandbox + run: nix build --out-link "result" --print-out-paths --print-build-logs ./test#checks.x86_64-linux.sandbox - name: Upload test output uses: actions/upload-artifact@v3 @@ -63,7 +63,7 @@ jobs: uses: actions/checkout@v4 - name: Run NixOS test - run: nix build --out-link "result" --print-out-paths --print-build-logs .#checks.x86_64-linux.sandbox-race + run: nix build --out-link "result" --print-out-paths --print-build-logs ./test#checks.x86_64-linux.sandbox-race - name: Upload test output uses: actions/upload-artifact@v3 @@ -80,7 +80,7 @@ jobs: uses: actions/checkout@v4 - name: Run NixOS test - run: nix build --out-link "result" --print-out-paths --print-build-logs .#checks.x86_64-linux.sharefs + run: nix build --out-link "result" --print-out-paths --print-build-logs ./test#checks.x86_64-linux.sharefs - name: Upload test output uses: actions/upload-artifact@v3 @@ -103,7 +103,7 @@ jobs: uses: actions/checkout@v4 - name: Run checks - run: nix --print-build-logs --experimental-features 'nix-command flakes' flake check + run: nix --print-build-logs --experimental-features 'nix-command flakes' flake check ./test dist: name: Create distribution @@ -116,9 +116,9 @@ jobs: id: build-test run: >- export HAKUREI_REV="$(git rev-parse --short HEAD)" && - sed -i.old 's/version = /version = "0.0.0-'$HAKUREI_REV'"; # version = /' package.nix && - nix build --print-out-paths --print-build-logs .#dist && - mv package.nix.old package.nix && + sed -i.old 's/version = /version = "0.0.0-'$HAKUREI_REV'"; # version = /' test/package.nix && + nix build --print-out-paths --print-build-logs ./test#dist && + mv test/{package.nix.old,package.nix} && echo "rev=$HAKUREI_REV" >> $GITHUB_OUTPUT - name: Upload test build diff --git a/README.md b/README.md index 7375ba0b..15f4b095 100644 --- a/README.md +++ b/README.md @@ -57,9 +57,4 @@ package [internal/rosa](https://pkg.go.dev/hakurei.app/internal/rosa). - [fuse](https://github.com/libfuse/libfuse) to implement the filesystem. New dependencies will generally not be added. Patches adding new dependencies -are very likely to be rejected. - -## NixOS Module (deprecated) - -The NixOS module is in maintenance mode and will be removed once planterette is -feature-complete. Full module documentation can be found [here](options.md). +are very likely to be rejected. \ No newline at end of file diff --git a/test/default.nix b/test/default.nix index 76a490a7..81daa0a2 100644 --- a/test/default.nix +++ b/test/default.nix @@ -54,7 +54,7 @@ testers.nixosTest { # Run with Go race detector: environment.hakurei = lib.mkIf withRace rec { # race detector does not support static linking - package = (pkgs.callPackage ../package.nix { }).overrideAttrs (previousAttrs: { + package = (pkgs.callPackage ./package.nix { }).overrideAttrs (previousAttrs: { env = previousAttrs.env // { GOFLAGS = previousAttrs.env.GOFLAGS + " -race"; }; diff --git a/flake.lock b/test/flake.lock similarity index 100% rename from flake.lock rename to test/flake.lock diff --git a/flake.nix b/test/flake.nix similarity index 91% rename from flake.nix rename to test/flake.nix index 92548b40..6c8cf100 100644 --- a/flake.nix +++ b/test/flake.nix @@ -43,19 +43,19 @@ ; in { - hakurei = callPackage ./test { inherit system self; }; - race = callPackage ./test { + hakurei = callPackage ./. { inherit system self; }; + race = callPackage ./. { inherit system self; withRace = true; }; - sandbox = callPackage ./test/sandbox { inherit self; }; - sandbox-race = callPackage ./test/sandbox { + sandbox = callPackage ./sandbox { inherit self; }; + sandbox-race = callPackage ./sandbox { inherit self; withRace = true; }; - sharefs = callPackage ./cmd/sharefs/test { inherit system self; }; + sharefs = callPackage ./sharefs { inherit system self; }; formatting = runCommandLocal "check-formatting" { nativeBuildInputs = [ nixfmt ]; } '' cd ${./.} @@ -116,7 +116,7 @@ nettools ; }; - hsu = pkgs.callPackage ./cmd/hsu/package.nix { inherit (self.packages.${system}) hakurei; }; + hsu = pkgs.callPackage ./hsu.nix { inherit (self.packages.${system}) hakurei; }; sharefs = pkgs.linkFarm "sharefs" { "bin/sharefs" = "${hakurei}/libexec/sharefs"; "bin/mount.fuse.sharefs" = "${hakurei}/libexec/sharefs"; @@ -190,11 +190,11 @@ }; } - ./test/interactive/configuration.nix - ./test/interactive/vm.nix - ./test/interactive/hakurei.nix - ./test/interactive/trace.nix - ./test/interactive/raceattr.nix + ./interactive/configuration.nix + ./interactive/vm.nix + ./interactive/hakurei.nix + ./interactive/trace.nix + ./interactive/raceattr.nix self.nixosModules.hakurei home-manager.nixosModules.home-manager diff --git a/cmd/hsu/package.nix b/test/hsu.nix similarity index 95% rename from cmd/hsu/package.nix rename to test/hsu.nix index 6075cdb1..7acb3529 100644 --- a/cmd/hsu/package.nix +++ b/test/hsu.nix @@ -8,7 +8,7 @@ buildGoModule { pname = "${hakurei.pname}-hsu"; inherit (hakurei) version; - src = ./.; + src = ../cmd/hsu; inherit (hakurei) vendorHash; env.CGO_ENABLED = 0; diff --git a/test/interactive/raceattr.nix b/test/interactive/raceattr.nix index d94d7a7b..de54f4cf 100644 --- a/test/interactive/raceattr.nix +++ b/test/interactive/raceattr.nix @@ -16,7 +16,7 @@ src = builtins.path { name = "${pname}-src"; - path = lib.cleanSource ../../cmd/sharefs/test; + path = lib.cleanSource ../sharefs; filter = path: type: (type == "directory") || (type == "regular" && lib.hasSuffix ".go" path); }; vendorHash = null; diff --git a/nixos.nix b/test/nixos.nix similarity index 100% rename from nixos.nix rename to test/nixos.nix diff --git a/options.md b/test/options.md similarity index 100% rename from options.md rename to test/options.md diff --git a/options.nix b/test/options.nix similarity index 100% rename from options.nix rename to test/options.nix diff --git a/package.nix b/test/package.nix similarity index 97% rename from package.nix rename to test/package.nix index d426bf6c..46567b69 100644 --- a/package.nix +++ b/test/package.nix @@ -34,11 +34,11 @@ buildGo126Module rec { pname = "hakurei"; - version = with lib.strings; removePrefix "v" (trim (builtins.readFile ./cmd/dist/VERSION)); + version = with lib.strings; removePrefix "v" (trim (builtins.readFile ../cmd/dist/VERSION)); srcFiltered = builtins.path { name = "${pname}-src"; - path = lib.cleanSource ./.; + path = lib.cleanSource ../.; filter = path: type: !(type == "regular" && (lib.hasSuffix ".nix" path || lib.hasSuffix ".py" path)) && !(type == "directory" && lib.hasSuffix "/test" path) && !(type == "directory" && lib.hasSuffix "/cmd/hsu" path); }; vendorHash = null; diff --git a/test/sandbox/default.nix b/test/sandbox/default.nix index a0b8d13a..47a59de9 100644 --- a/test/sandbox/default.nix +++ b/test/sandbox/default.nix @@ -14,7 +14,7 @@ testers.nixosTest { # Run with Go race detector: environment.hakurei = lib.mkIf withRace rec { # race detector does not support static linking - package = (pkgs.callPackage ../../package.nix { }).overrideAttrs (previousAttrs: { + package = (pkgs.callPackage ../package.nix { }).overrideAttrs (previousAttrs: { env = previousAttrs.env // { GOFLAGS = previousAttrs.env.GOFLAGS + " -race"; }; diff --git a/cmd/sharefs/test/configuration.nix b/test/sharefs/configuration.nix similarity index 100% rename from cmd/sharefs/test/configuration.nix rename to test/sharefs/configuration.nix diff --git a/cmd/sharefs/test/default.nix b/test/sharefs/default.nix similarity index 100% rename from cmd/sharefs/test/default.nix rename to test/sharefs/default.nix diff --git a/cmd/sharefs/test/raceattr.go b/test/sharefs/raceattr.go similarity index 100% rename from cmd/sharefs/test/raceattr.go rename to test/sharefs/raceattr.go diff --git a/cmd/sharefs/test/test.py b/test/sharefs/test.py similarity index 100% rename from cmd/sharefs/test/test.py rename to test/sharefs/test.py