From 32b8465e50904004572fe84dbe53c9d62b97dcfb Mon Sep 17 00:00:00 2001 From: "Gustavo \"Guz\" L de Mello" Date: Mon, 11 May 2026 20:51:24 -0300 Subject: [PATCH] chore: remove VERSION file --- .gitea/workflows/build_nightly.yaml | 2 -- VERSION | 1 - flake.nix | 26 +++++++++++++++----------- makefile | 13 +++++++------ 4 files changed, 22 insertions(+), 20 deletions(-) delete mode 100644 VERSION diff --git a/.gitea/workflows/build_nightly.yaml b/.gitea/workflows/build_nightly.yaml index c8c1589..0218887 100644 --- a/.gitea/workflows/build_nightly.yaml +++ b/.gitea/workflows/build_nightly.yaml @@ -14,8 +14,6 @@ jobs: - name: Build run: | - cp ./VERSION ./VERSION.tmp - echo "$(cat ./VERSION.tmp)+$(git rev-parse --short $GITHUB_SHA)" > ./VERSION nix build .#default - name: Rename diff --git a/VERSION b/VERSION deleted file mode 100644 index 63a3f5c..0000000 --- a/VERSION +++ /dev/null @@ -1 +0,0 @@ -0.3.0-26.1.2 diff --git a/flake.nix b/flake.nix index e91dde1..2111dbd 100644 --- a/flake.nix +++ b/flake.nix @@ -45,17 +45,21 @@ stdenv, zip, }: - stdenv.mkDerivation { - name = "sixsides-cosmetics"; - version = builtins.readFile ./VERSION; - buildInputs = [nodejs gnumake jq zip]; - src = lib.cleanSource ./.; - dontBuild = true; - installPhase = '' - make release - cp "$(find -type f -name '*.zip' | head -n 1)" $out - ''; - }) {}; + with lib; let + mcmeta = importJSON ./pack.mcmeta; + version = (elemAt mcmeta.pack.description."with" 0).fallback; + in + stdenv.mkDerivation { + name = "sixsides-cosmetics"; + inherit version; + buildInputs = [nodejs gnumake jq zip]; + src = lib.cleanSource ./.; + dontBuild = true; + installPhase = '' + make release + cp "$(find -type f -name '*.zip' | head -n 1)" $out + ''; + }) {}; default = self.packages.${pkgs.stdenv.hostPlatform.system}.sixsides-cosmetics; }); }; diff --git a/makefile b/makefile index 54378c0..8d95e76 100644 --- a/makefile +++ b/makefile @@ -1,16 +1,17 @@ release: clean node ./.meta/generate_helmets.js - jq --arg version $$(cat VERSION) '.pack.description.with[0].fallback = $$version' ./pack.mcmeta > ./pack.mcmeta.tmp - mv ./pack.mcmeta.tmp ./pack.mcmeta - find ./assets ./data pack.mcmeta -type f -print | zip SixSides\ Cosmetics\ \(v$$(cat VERSION)\).zip -@ + find ./assets ./data pack.mcmeta -type f -print \ + | zip SixSides\ Cosmetics\ \(v$$(jq -r '.pack.description.with[0].fallback' ./pack.mcmeta)\).zip -@ sync: release @echo "Syncing files..." - cp SixSides\ Cosmetics\ \(v$$(cat VERSION)\).zip $(RESOURCEPACK_FOLDER) - cp SixSides\ Cosmetics\ \(v$$(cat VERSION)\).zip $(DATAPACK_FOLDER) + cp SixSides\ Cosmetics\ \(v$$(jq -r '.pack.description.with[0].fallback' ./pack.mcmeta)\).zip \ + $(RESOURCEPACK_FOLDER) + cp SixSides\ Cosmetics\ \(v$$(jq -r '.pack.description.with[0].fallback' ./pack.mcmeta)\).zip \ + $(DATAPACK_FOLDER) clean: - if [ -f SixSides\ Cosmetics\ \(v$$(cat VERSION)\).zip ]; then rm SixSides\ Cosmetics\ \(v$$(cat VERSION)\).zip; fi + if [ -f SixSides\ Cosmetics\ \(v$$(cat VERSION)\).zip ]; then rm SixSides\ Cosmetics\ \(v$$(jq -r '.pack.description.with[0].fallback' ./pack.mcmeta)\).zip; fi dev: while true; do $(MAKE) sync || $(MAKE); sleep 0.5; done