From df4538f6ed6fb70d62149b14844b2309e3c313ff Mon Sep 17 00:00:00 2001
From: Johannes Loher <johannes.loher@fg4f.de>
Date: Mon, 28 Nov 2022 01:18:44 +0100
Subject: [PATCH] ci: use $PACKAGE_TYPE variable in more places

---
 .gitlab-ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4d5ad90c..9b0d35e7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -100,7 +100,7 @@ publish-artifacts:
         - apk add zip curl
     script: |
         cd dist
-        zip -r ../system.zip .
+        zip -r ../$PACKAGE_TYPE.zip .
         cd ..
         curl --header "JOB-TOKEN: $CI_JOB_TOKEN" --upload-file $PACKAGE_TYPE.zip "$PACKAGE_REGISTRY_URL/$CI_COMMIT_TAG/$PACKAGE_TYPE.zip"
         curl --header "JOB-TOKEN: $CI_JOB_TOKEN" --upload-file dist/$PACKAGE_TYPE.json "$PACKAGE_REGISTRY_URL/$CI_COMMIT_TAG/$PACKAGE_TYPE.json"
@@ -190,7 +190,7 @@ publish-to-foundry-admin:
     image: johannesloher/foundry-publish
     variables:
         FVTT_MANIFEST_PATH: dist/$PACKAGE_TYPE.json
-        FVTT_MANIFEST_URL: ${CI_PROJECT_URL}/-/releases/${CI_COMMIT_TAG}/downloads/system.json
+        FVTT_MANIFEST_URL: ${CI_PROJECT_URL}/-/releases/${CI_COMMIT_TAG}/downloads/$PACKAGE_TYPE.json
         FVTT_DELETE_OBSOLETE_VERSIONS: "true"
     script: foundry-publish
     rules: