diff --git a/.woodpecker.yaml b/.woodpecker.yml similarity index 74% rename from .woodpecker.yaml rename to .woodpecker.yml index a703bed..fc6ae14 100644 --- a/.woodpecker.yaml +++ b/.woodpecker.yml @@ -1,6 +1,6 @@ pipeline: build: - image: alpine + image: fedora commands: - make publish: @@ -9,4 +9,6 @@ pipeline: api_key: from_secret: GITEA_KEY base_url: https://gitea.malloc.hackerbots.net/ - files: *.zip *.sha1 + files: + - ./*.zip + - ./*.sha1 diff --git a/Makefile b/Makefile index e7a3593..2cf18d8 100644 --- a/Makefile +++ b/Makefile @@ -4,6 +4,9 @@ BUILD_VERSION:=$(shell git describe --tags) all: malloc-data-$(BUILD_VERSION).zip malloc-data-$(BUILD_VERSION).zip.sha1 +pack.mcmeta: pack.mcmeta.in + sed -e 's/@VERSION@/$(BUILD_VERSION)/g' $< > $@ + malloc-data-$(BUILD_VERSION).zip: pack.mcmeta zip -r $@ pack.mcmeta data diff --git a/pack.mcmeta b/pack.mcmeta index 0599153..2ab00cc 100644 --- a/pack.mcmeta +++ b/pack.mcmeta @@ -1,6 +1,6 @@ { "pack": { "pack_format": 10, - "description": "Malloc Minecraft Item Functions (1.0.0)" + "description": "Malloc Minecraft Item Functions (v1.0.0-1-gf988858)" } } diff --git a/pack.mcmeta.in b/pack.mcmeta.in new file mode 100644 index 0000000..8789d59 --- /dev/null +++ b/pack.mcmeta.in @@ -0,0 +1,6 @@ +{ + "pack": { + "pack_format": 10, + "description": "Malloc Minecraft Item Functions (@VERSION@)" + } +}