From 18a66e47488346ba080f53ffd31c7e078b5479a2 Mon Sep 17 00:00:00 2001
From: Johannes Loher <johannes.loher@fg4f.de>
Date: Sat, 17 Jun 2023 22:46:47 +0200
Subject: [PATCH] ci: fix publishing to foundry admin

---
 .woodpecker/publish.yml | 10 +++++-----
 .woodpecker/release.yml |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.woodpecker/publish.yml b/.woodpecker/publish.yml
index b09b0d1..b60f8f1 100644
--- a/.woodpecker/publish.yml
+++ b/.woodpecker/publish.yml
@@ -23,15 +23,15 @@ steps:
       NODE_ENV: production
     commands:
       - yarn build
+      - mv dist ${CI_REPO_NAME}
   publish-artifacts:
     group: prepare-release
     image: alpine:latest
     commands:
       - apk update
       - apk add zip curl
-      - mv dist ${CI_REPO_NAME}
       - zip -r ${CI_REPO_NAME}.zip ${CI_REPO_NAME}/*
-      - CI_FORGE_API_URL=${CI_FORGE_URL}/api/v4
+      - export CI_FORGE_API_URL=${CI_FORGE_URL}/api/v4
       - 'curl --fail --header "Authorization: Bearer $${FORGE_TOKEN}" --upload-file ${CI_REPO_NAME}.zip "$${CI_FORGE_API_URL}/projects/${CI_REPO_REMOTE_ID}/packages/generic/${CI_REPO_NAME}/${CI_COMMIT_TAG}/${CI_REPO_NAME}.zip"'
       - 'curl --fail --header "Authorization: Bearer $${FORGE_TOKEN}" --upload-file ${CI_REPO_NAME}/$${PACKAGE_TYPE}.json "$${CI_FORGE_API_URL}/projects/${CI_REPO_REMOTE_ID}/packages/generic/${CI_REPO_NAME}/${CI_COMMIT_TAG}/$${PACKAGE_TYPE}.json"'
     secrets:
@@ -45,7 +45,7 @@ steps:
   release:
     image: registry.gitlab.com/gitlab-org/release-cli:latest
     commands:
-      - CI_FORGE_API_URL=${CI_FORGE_URL}/api/v4
+      - export CI_FORGE_API_URL=${CI_FORGE_URL}/api/v4
       - |
         release-cli \
         --server-url ${CI_FORGE_URL} \
@@ -67,8 +67,8 @@ steps:
     environment:
       FVTT_DELETE_OBSOLETE_VERSIONS: 'true'
     commands:
-      - FVTT_MANIFEST_PATH=${CI_REPO_NAME}/$${PACKAGE_TYPE}.json
-      - FVTT_MANIFEST_URL=${CI_REPO_URL}/-/releases/${CI_COMMIT_TAG}/downlaods/$${PACKAGE_TYPE}.json
+      - export FVTT_MANIFEST_PATH=${CI_REPO_NAME}/$${PACKAGE_TYPE}.json
+      - export FVTT_MANIFEST_URL=${CI_REPO_URL}/-/releases/${CI_COMMIT_TAG}/downlaods/$${PACKAGE_TYPE}.json
       - foundry-publish
     secrets:
       - fvtt_package_id
diff --git a/.woodpecker/release.yml b/.woodpecker/release.yml
index 7324374..830b494 100644
--- a/.woodpecker/release.yml
+++ b/.woodpecker/release.yml
@@ -22,12 +22,12 @@ steps:
     commands:
       - apt-get update
       - apt-get install --yes jq
-      - REPOSITORY_URL=$(echo "${CI_REPO_CLONE_URL}" | sed -e "s|://|://$${FORGE_TOKEN_NAME}:$${FORGE_TOKEN}@|g")
+      - export REPOSITORY_URL=$(echo "${CI_REPO_CLONE_URL}" | sed -e "s|://|://$${FORGE_TOKEN_NAME}:$${FORGE_TOKEN}@|g")
       - git remote set-url origin $${REPOSITORY_URL}
       - git config user.name woodpecker[bot]
       - git config user.email woodpecker[bot]@${CI_SYSTEM_HOST}
       - yarn bump-version --release=${RELEASE_TYPE}
-      - RELEASE_VERSION=$(jq -r '.version' < package.json)
+      - export RELEASE_VERSION=$(jq -r '.version' < package.json)
       - git --no-pager diff
       - git add package.json module.json
       - 'git commit -m "chore(release): $${RELEASE_VERSION}"'