From 80286da166ace75f8507fde8e0c2f1085333dcb7 Mon Sep 17 00:00:00 2001 From: Nathan Coad Date: Mon, 2 Feb 2026 10:52:21 +1100 Subject: [PATCH] drone fix --- .drone.yml | 68 +++++++++++++++++++++++++++--------------------------- 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/.drone.yml b/.drone.yml index b850245..192ac1e 100644 --- a/.drone.yml +++ b/.drone.yml @@ -13,22 +13,22 @@ steps: - apk add --no-cache curl jq - | set -euo pipefail - repo_owner="${DRONE_REPO_OWNER}" - repo_name="${DRONE_REPO_NAME}" - releases_url="${GITEA_BASE_URL}/api/v1/repos/${repo_owner}/${repo_name}/releases?limit=1" - latest_tag="$(curl -sf -H "Authorization: token ${GITEA_TOKEN}" "${releases_url}" | jq -r '.[0].tag_name // empty')" - if [ -z "${latest_tag}" ] || [ "${latest_tag}" = "null" ]; then + repo_owner="$${DRONE_REPO_OWNER}" + repo_name="$${DRONE_REPO_NAME}" + releases_url="$${GITEA_BASE_URL}/api/v1/repos/$${repo_owner}/$${repo_name}/releases?limit=1" + latest_tag="$$(curl -sf -H "Authorization: token $${GITEA_TOKEN}" "$${releases_url}" | jq -r '.[0].tag_name // empty')" + if [ -z "$${latest_tag}" ] || [ "$${latest_tag}" = "null" ]; then latest_tag="v0.0.0" fi - version="${latest_tag#v}" - IFS='.' read -r major minor patch <<< "${version}" - if ! [[ "${major:-}" =~ ^[0-9]+$ ]]; then major=0; fi - if ! [[ "${minor:-}" =~ ^[0-9]+$ ]]; then minor=0; fi - if ! [[ "${patch:-}" =~ ^[0-9]+$ ]]; then patch=0; fi + version="$${latest_tag#v}" + IFS='.' read -r major minor patch <<< "$${version}" + if ! [[ "$${major:-}" =~ ^[0-9]+$ ]]; then major=0; fi + if ! [[ "$${minor:-}" =~ ^[0-9]+$ ]]; then minor=0; fi + if ! [[ "$${patch:-}" =~ ^[0-9]+$ ]]; then patch=0; fi patch=$((patch + 1)) - next_tag="v${major}.${minor}.${patch}" - echo "${next_tag}" > .release_version - echo "Next release: ${next_tag}" + next_tag="v$${major}.$${minor}.$${patch}" + echo "$${next_tag}" > .release_version + echo "Next release: $${next_tag}" - name: build-deb-amd64 image: cache.coadcorp.com/library/buildpack-deps:jammy depends_on: @@ -120,31 +120,31 @@ steps: - apk add --no-cache curl jq - | set -euo pipefail - release_tag="$(cat .release_version)" - repo_owner="${DRONE_REPO_OWNER}" - repo_name="${DRONE_REPO_NAME}" - api_base="${GITEA_BASE_URL}/api/v1/repos/${repo_owner}/${repo_name}" + release_tag="$$(cat .release_version)" + repo_owner="$${DRONE_REPO_OWNER}" + repo_name="$${DRONE_REPO_NAME}" + api_base="$${GITEA_BASE_URL}/api/v1/repos/$${repo_owner}/$${repo_name}" payload="$(jq -n \ - --arg tag "${release_tag}" \ - --arg name "${release_tag}" \ - --arg body "Automated release for ${release_tag}" \ - --arg target "${DRONE_COMMIT_SHA}" \ + --arg tag "$${release_tag}" \ + --arg name "$${release_tag}" \ + --arg body "Automated release for $${release_tag}" \ + --arg target "$${DRONE_COMMIT_SHA}" \ '{tag_name:$tag, name:$name, body:$body, draft:false, prerelease:false, target_commitish:$target}')" - response="$(curl -sS -w '\n%{http_code}' -H "Authorization: token ${GITEA_TOKEN}" -H "Content-Type: application/json" -d "${payload}" "${api_base}/releases")" - status="$(echo "${response}" | tail -n1)" - body="$(echo "${response}" | sed '$d')" - if [ "${status}" != "201" ] && [ "${status}" != "200" ]; then - body="$(curl -sS -H "Authorization: token ${GITEA_TOKEN}" "${api_base}/releases/tags/${release_tag}")" + response="$$(curl -sS -w '\n%{http_code}' -H "Authorization: token $${GITEA_TOKEN}" -H "Content-Type: application/json" -d "$${payload}" "$${api_base}/releases")" + status="$$(echo "$${response}" | tail -n1)" + body="$$(echo "$${response}" | sed '$d')" + if [ "$${status}" != "201" ] && [ "$${status}" != "200" ]; then + body="$$(curl -sS -H "Authorization: token $${GITEA_TOKEN}" "$${api_base}/releases/tags/$${release_tag}")" fi - release_id="$(echo "${body}" | jq -r '.id // empty')" - if [ -z "${release_id}" ] || [ "${release_id}" = "null" ]; then - echo "Failed to create or fetch release for ${release_tag}" - echo "${body}" + release_id="$$(echo "$${body}" | jq -r '.id // empty')" + if [ -z "$${release_id}" ] || [ "$${release_id}" = "null" ]; then + echo "Failed to create or fetch release for $${release_tag}" + echo "$${body}" exit 1 fi for file in dist/*.deb; do - name="$(basename "${file}")" - curl -sS -H "Authorization: token ${GITEA_TOKEN}" \ - -F "attachment=@${file}" \ - "${api_base}/releases/${release_id}/assets?name=${name}" >/dev/null + name="$$(basename "$${file}")" + curl -sS -H "Authorization: token $${GITEA_TOKEN}" \ + -F "attachment=@$${file}" \ + "$${api_base}/releases/$${release_id}/assets?name=$${name}" >/dev/null done