diff --git a/.forgejo/workflows/geyser.yml b/.forgejo/workflows/geyser.yml index ce6e66d..ce36206 100644 --- a/.forgejo/workflows/geyser.yml +++ b/.forgejo/workflows/geyser.yml @@ -16,15 +16,6 @@ jobs: with: fetch-depth: 0 token: ${{ secrets.PIPELINE_TOKEN }} - - name: "Get LFS objects" - uses: https://forgejo.skynet.ie/Skynet/actions/get_lfs@v3 - with: - repository: ${{ gitea.repository }} - ref_name: ${{ gitea.ref_name }} - - name: Get all LFS objects - run: | - # Pull in all objects for all branches - git lfs fetch --all - name: setup git config run: | # setup the username and email. I tend to use 'GitHub Actions Bot' with no email by default @@ -36,16 +27,9 @@ jobs: branches=() eval "$(git for-each-ref --shell --format='branches+=(%(refname))' refs/remotes/origin/)" for branch in "${branches[@]}"; do - # for debugging - echo "$branch" - if [ "$branch" == "refs/remotes/origin/HEAD" ]; then - continue - fi - # need to convert "'refs/remotes/origin/main" to "main" branch_local=$(echo "$branch" | awk -F'[\\\\/]' ' { print $4 }') git switch $branch_local - git lfs pull git status nix run .#update_plugin -- update geyser diff --git a/.packwizignore b/.packwizignore index 591a7a4..0ac0d94 100644 --- a/.packwizignore +++ b/.packwizignore @@ -1,13 +1,10 @@ -# No need to have anything outside teh packwiz files inside teh pack +# DOnt add teh IDE's /.forgejo /.idea /docs -/nix - -.git* # dont add nix stuff flake.* +/nix -# Dont add documentation *.md diff --git a/flake.nix b/flake.nix index e7da961..03733d8 100644 --- a/flake.nix +++ b/flake.nix @@ -7,6 +7,7 @@ }; nixConfig = { + bash-prompt-suffix = "[Skynet Dev] "; extra-substituters = "https://nix-cache.skynet.ie/skynet-cache"; extra-trusted-public-keys = "skynet-cache:zMFLzcRZPhUpjXUy8SF8Cf7KGAZwo98SKrzeXvdWABo="; }; @@ -28,7 +29,6 @@ devShells.default = pkgs.mkShell { name = "Skynet Mod env"; packages = packages_local; - shellHook = "export PS1='[Skynet Dev] '"; }; packages = { diff --git a/nix/packwiz.nix b/nix/packwiz.nix index de16856..93289fe 100644 --- a/nix/packwiz.nix +++ b/nix/packwiz.nix @@ -8,13 +8,13 @@ buildGoModule { pname = "packwiz"; - version = "0-unstable-2025-05-08"; + version = "0-unstable-2024-10-15"; src = fetchFromGitHub { owner = "Silver-Golden"; repo = "packwiz"; - rev = "7ae91a58dbec3b76ce0aaaf15aeba3118021a34f"; - sha256 = "sha256-3zUkePmVJTpU9+mkLyeqlZ1KNVDXNsFvoh8ifwXya1M="; + rev = "453264019e54eae69f495078b0f3fa073f071e73"; + sha256 = "sha256-x6Z8MLaacZFlRYOVkTU+ffYtCJu4FAB3I2W/uQITwns="; }; passthru.updateScript = unstableGitUpdater { }; diff --git a/pack.toml b/pack.toml index 9f8f38d..ba7b70b 100644 --- a/pack.toml +++ b/pack.toml @@ -13,4 +13,3 @@ purpur = "2428" [options] acceptable-game-versions = ["1.21", "1.21.1", "1.21.2", "1.21.3", "1.21.4", "1.21.5"] -datapack-folder = "plugins"