Skip to content

Commit

Permalink
feat: correctly download everything for docker
Browse files Browse the repository at this point in the history
  • Loading branch information
tboerger committed Jan 18, 2024
1 parent bf98a4b commit 2276bf1
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:

- name: Download mods
id: packwiz
run: make fetch
run: make server

- name: Docker meta
id: meta
Expand Down
10 changes: 7 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,13 @@ endif
$(DIST)/$(NAME)-$(OUTPUT).mrpack.sha256: $(DIST)
cd $(DIST) && $(SHASUM) $(NAME)-$(OUTPUT).mrpack >| $(NAME)-$(OUTPUT).mrpack.sha256

.PHONY: fetch
fetch: packwiz-installer-bootstrap.jar
java -jar packwiz-installer-bootstrap.jar --no-gui pack.toml
.PHONY: client
client: packwiz-installer-bootstrap.jar
java -jar packwiz-installer-bootstrap.jar --no-gui pack.toml --side client

.PHONY: server
server: packwiz-installer-bootstrap.jar
java -jar packwiz-installer-bootstrap.jar --no-gui pack.toml --side server

packwiz-installer-bootstrap.jar:
curl -sSLo packwiz-installer-bootstrap.jar $(BOOTSTRAP_URL)
4 changes: 4 additions & 0 deletions index.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ hash-format = "sha256"
file = "config/chunkloaders-common.toml"
hash = "8922b65d3c98bd37d3b0f52c59d3129d85bf505ec69cf02085defba2be1b0d21"

[[files]]
file = "config/simplebackups-common.toml"
hash = "50f6634d51c2ce851c5f432a6056dcbdfb6f6fb182c7652850f02f82f7f0d878"

[[files]]
file = "mods/advanced-mining-dimension.pw.toml"
hash = "d4b7dccef2a7471bf9a52424c6e7c81305b4c81454c113750a12e9acc5805cf1"
Expand Down
2 changes: 1 addition & 1 deletion pack.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ pack-format = "packwiz:1.1.0"
[index]
file = "index.toml"
hash-format = "sha256"
hash = "0dc65593d4f2fc8c626942103556cbb02a9168fa44830420d13469912826b1bd"
hash = "df2129a0dbb532fe7636fd18795caf248c4d82a2ea916daae0b072fa245f5673"

[versions]
minecraft = "1.20.1"
Expand Down
2 changes: 1 addition & 1 deletion packwiz.json

Large diffs are not rendered by default.

0 comments on commit 2276bf1

Please sign in to comment.