From fbf7e826d06b77e29e5890c497a3c834e6b1d01a Mon Sep 17 00:00:00 2001 From: Joscha Maier Date: Thu, 26 Sep 2024 14:08:24 +0200 Subject: [PATCH 1/6] fix: wrong links --- .gitlab-ci.yml | 2 +- gulpfile.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1ad4239..e7b426c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -79,6 +79,6 @@ create-release: url: "${MANIFEST_RELEASE_URL}" filepath: "/${MANIFEST}" - name: "$ZIPFILE" - url: "${ZIPFILE_PERMALINK_URL}" + url: "${ZIPFILE_RELEASE_URL}" filepath: "/${ZIPFILE}" diff --git a/gulpfile.js b/gulpfile.js index d219d8d..ed0f27d 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -328,7 +328,7 @@ async function publishToFoundry(done) { function updateSystemJson(done) { const ManifestPath = 'system.json'; const Manifest = JSON.parse(fs.readFileSync(ManifestPath)); - const zipUrl = process.env.ZIPFILE_PERMALINK_URL || 'https://gitlab.com/wintermyst/kidsonbrooms/-/raw/master/kidsonbrooms.zip?inline=false'; + const zipUrl = process.env.ZIPFILE_RELEASE_URL || 'https://gitlab.com/wintermyst/kidsonbrooms/-/raw/master/kidsonbrooms.zip?inline=false'; Manifest.download = zipUrl; From f653eb2ef2a64af8061a88932f5f708999f840fb Mon Sep 17 00:00:00 2001 From: WinterMyst <22961076-wintermyst@users.noreply.gitlab.com> Date: Thu, 26 Sep 2024 12:08:48 +0000 Subject: [PATCH 2/6] Old system --- .gitlab-ci.yml | 2 +- gulpfile.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e7b426c..0234a5b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -11,7 +11,7 @@ variables: PACKAGE_REGISTRY_URL: "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/${CI_PROJECT_NAME}/${CI_COMMIT_TAG}" MANIFEST_RELEASE_URL: "${PACKAGE_REGISTRY_URL}/${MANIFEST}" ZIPFILE_RELEASE_URL: "${PACKAGE_REGISTRY_URL}/${ZIPFILE}" - MANIFEST_PERMALINK_URL: "https://gitlab.com/${CI_PROJECT_NAMESPACE}/${CI_PROJECT_NAME}/-/releases/permalink/latest/downloads/${MANIFEST}" + MANIFEST_PERMALINK_URL: "https://gitlab.com/${CI_PROJECT_NAMESPACE}/${CI_PROJECT_NAME}/-/releases/${CI_COMMIT_TAG}/downloads/${MANIFEST}" ZIPFILE_PERMALINK_URL: "https://gitlab.com/${CI_PROJECT_NAMESPACE}/${CI_PROJECT_NAME}/-/releases/${CI_COMMIT_TAG}/downloads/${ZIPFILE}" dry_run: true diff --git a/gulpfile.js b/gulpfile.js index ed0f27d..ec4a710 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -268,8 +268,8 @@ async function publishToFoundry(done) { const compMin = moduleManifest.compatibility.minimum; const compVer = moduleManifest.compatibility.verified; const compMax = moduleManifest.compatibility.maximum; - const manifest = process.env.MANIFEST_RELEASE_URL || `https://gitlab.com/${process.env.CI_PROJECT_NAMESPACE}/${process.env.CI_PROJECT_NAME}/-/releases/${process.env.CI_COMMIT_TAG}/downloads/${moduleManifestPath}`; - const notes = `https://gitlab.com/${process.env.CI_PROJECT_NAMESPACE}/${process.env.CI_PROJECT_NAME}/-/tags/${process.env.CI_COMMIT_TAG}`; + const manifest = process.env.MANIFEST_PERMALINK_URL || `https://gitlab.com/${process.env.CI_PROJECT_NAMESPACE}/${process.env.CI_PROJECT_NAME}/-/releases/${process.env.CI_COMMIT_TAG}/downloads/${moduleManifestPath}`; + const notes = `https://gitlab.com/${process.env.CI_PROJECT_NAMESPACE}/${process.env.CI_PROJECT_NAME}/-/releases/${process.env.CI_COMMIT_TAG}`; const dryRun = process.env.dry_run === 'true'; const authToken = process.env.FOUNDRY_API_KEY; From 60c31993b08f536856e5c640c4932f5a08fc1a39 Mon Sep 17 00:00:00 2001 From: WinterMyst <22961076-wintermyst@users.noreply.gitlab.com> Date: Thu, 26 Sep 2024 12:09:04 +0000 Subject: [PATCH 3/6] Update system.json --- system.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system.json b/system.json index 984c56b..2c930b8 100644 --- a/system.json +++ b/system.json @@ -2,7 +2,7 @@ "id": "kidsonbrooms", "title": "Kids on Brooms System", "description": "The Kids on Brooms system for FoundryVTT!", - "version": "1.1.3", + "version": "1.1.4", "compatibility": { "minimum": 12, "verified": 12.331 From 5dfdd81d7492c3cf5365bb4ffba7adc6decc330e Mon Sep 17 00:00:00 2001 From: WinterMyst <22961076-wintermyst@users.noreply.gitlab.com> Date: Thu, 26 Sep 2024 12:09:19 +0000 Subject: [PATCH 4/6] Update package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e5731dc..ffa2454 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "kidsonbrooms", - "version": "1.1.3", + "version": "1.1.4", "description": "CSS compiler for the Kids On Brooms system", "scripts": { "build": "gulp build", From 4af976cac77455c8ecf603ea2245864d15384ee4 Mon Sep 17 00:00:00 2001 From: WinterMyst <22961076-wintermyst@users.noreply.gitlab.com> Date: Fri, 27 Sep 2024 21:36:34 +0000 Subject: [PATCH 5/6] Update system.json --- system.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system.json b/system.json index 2c930b8..43c14fd 100644 --- a/system.json +++ b/system.json @@ -2,7 +2,7 @@ "id": "kidsonbrooms", "title": "Kids on Brooms System", "description": "The Kids on Brooms system for FoundryVTT!", - "version": "1.1.4", + "version": "1.1.5", "compatibility": { "minimum": 12, "verified": 12.331 From 8f8a66c78a40ae9fe2d5e32dd484f5b84d1382a6 Mon Sep 17 00:00:00 2001 From: WinterMyst <22961076-wintermyst@users.noreply.gitlab.com> Date: Fri, 27 Sep 2024 21:36:49 +0000 Subject: [PATCH 6/6] Update package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ffa2454..3e6615c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "kidsonbrooms", - "version": "1.1.4", + "version": "1.1.5", "description": "CSS compiler for the Kids On Brooms system", "scripts": { "build": "gulp build",