feat: finish intial release

.github/workflows/client.yml

@@ -42,7 +42,7 @@ jobs:
           passphrase: ${{ secrets.GNUPG_PASSWORD }}
           detach_sign: true
           files: |
-            *.mrpack
+            dist/*.mrpack
 
       - name: Upload release
         id: upload
@@ -52,22 +52,18 @@ jobs:
           token: ${{ secrets.GITHUB_TOKEN }}
           allowUpdates: true
           omitBody: true
-          artifacts: |
-            *.mrpack
-            *.mrpack.sha256
+          artifacts: dist/*
 
       - name: Upload version
         id: version
         if: startsWith(github.ref, 'refs/tags/')
         run: |
-          aws s3 cp *.mrpack s3://dl.webhippie.de/minecraft/boergers/${{ github.ref_name }}/
-          aws s3 cp *.mrpack.sha256 s3://dl.webhippie.de/minecraft/boergers/${{ github.ref_name }}/
+          aws s3 sync dist/ s3://dl.webhippie.de/minecraft/boergers/${{ github.ref_name }}/
 
       - name: Upload testing
         id: testing
         if: startsWith(github.ref, 'refs/heads/')
         run: |
-          aws s3 cp *.mrpack s3://dl.webhippie.de/minecraft/boergers/testing/
-          aws s3 cp *.mrpack.sha256 s3://dl.webhippie.de/minecraft/boergers/testing/
+          aws s3 sync dist/ s3://dl.webhippie.de/minecraft/boergers/testing/
 
 ...

.gitignore

@@ -2,7 +2,3 @@ dist/
 docs/public/
 
 *.jar
-
-*.zip
-*.mrpack
-*.sha256

.packwizignore

@@ -2,9 +2,9 @@ deploy/
 docker/
 docs/
 overlay/
+dist/
 
 *.jar
-*.sha256
 
 packwiz.json
 Makefile

Makefile

@@ -1,5 +1,6 @@
 SHELL := bash
 NAME := boergers
+DIST := dist
 
 UNAME := $(shell uname -s)
 
@@ -30,27 +31,30 @@ ifndef VERSION
 	endif
 endif
 
+$(DIST):
+	mkdir -p $(DIST)
+
 .PHONY: clean
 clean:
-	rm -f $(NAME)-*.mrpack $(NAME)-*.mrpack.sha256
+	rm -rf $(DIST)
 
 .PHONY: docs
 docs:
 	cd docs; hugo
 
 .PHONY: build
-build: $(NAME)-$(OUTPUT).mrpack $(NAME)-$(OUTPUT).mrpack.sha256
+build: $(DIST)/$(NAME)-$(OUTPUT).mrpack $(DIST)/$(NAME)-$(OUTPUT).mrpack.sha256
 
-$(NAME)-$(OUTPUT).mrpack:
+$(DIST)/$(NAME)-$(OUTPUT).mrpack: $(DIST)
 	$(SED) -i 's|version = ".*"|version = "$(VERSION)"|' pack.toml
-	packwiz modrinth export
-	git checkout pack.toml
+	cd $(DIST) && packwiz modrinth export --meta-folder-base $(CURDIR)/ --pack-file $(CURDIR)/pack.toml --yes
+	git checkout $(CURDIR)/pack.toml
 ifeq ($(OUTPUT), testing)
-	mv $(NAME)-$(VERSION).mrpack $(NAME)-$(OUTPUT).mrpack
+	mv $(DIST)/$(NAME)-$(VERSION).mrpack $(DIST)/$(NAME)-$(OUTPUT).mrpack
 endif
 
-$(NAME)-$(OUTPUT).mrpack.sha256:
-	$(SHASUM) $(NAME)-$(OUTPUT).mrpack >| $(NAME)-$(OUTPUT).mrpack.sha256
+$(DIST)/$(NAME)-$(OUTPUT).mrpack.sha256: $(DIST)
+	cd $(DIST) && $(SHASUM) $(NAME)-$(OUTPUT).mrpack >| $(NAME)-$(OUTPUT).mrpack.sha256
 
 .PHONY: fetch
 fetch: packwiz-installer-bootstrap.jar

deploy/kubernetes/kustomization.yml

@@ -26,6 +26,6 @@ secretGenerator:
 images:
   - name: minecraft-server
     newName: quay.io/crafthippie/boergers
-    newTag: 1.0.0
+    newTag: latest
 
 ...

docker/Dockerfile.amd64

@@ -13,4 +13,5 @@ RUN apt-get update && \
 
 ENV MINECRAFT_LEVEL_TYPE DEFAULT
 
-COPY ./mods/* /usr/share/minecraft/mods
+COPY ./mods /usr/share/minecraft/mods
+COPY ./config /usr/share/minecraft/config

docker/Dockerfile.arm64

@@ -13,4 +13,5 @@ RUN apt-get update && \
 
 ENV MINECRAFT_LEVEL_TYPE DEFAULT
 
-COPY ./mods/* /usr/share/minecraft/mods
+COPY ./mods /usr/share/minecraft/mods
+COPY ./config /usr/share/minecraft/config

pack.toml

@@ -1,6 +1,6 @@
 name = "boergers"
 author = "Thomas Boerger"
-version = "1.0.0"
+version = "testing"
 pack-format = "packwiz:1.1.0"
 
 [index]