refactor: Use HTTP Basic Auth instead of tokens for package uploads
Some checks are pending
Tests & Quality Checks / Test on Python 3.11 (push) Waiting to run
Tests & Quality Checks / Test on Python 3.12 (push) Waiting to run
Tests & Quality Checks / Test on Python 3.11-1 (push) Waiting to run
Tests & Quality Checks / Test on Python 3.12-1 (push) Waiting to run
Tests & Quality Checks / Test on Python 3.10 (push) Waiting to run
Tests & Quality Checks / Test on Python 3.11-2 (push) Waiting to run
Tests & Quality Checks / Test on Python 3.12-2 (push) Waiting to run
Tests & Quality Checks / Build Artifacts (push) Blocked by required conditions
Tests & Quality Checks / Build Artifacts-1 (push) Blocked by required conditions
Some checks are pending
Tests & Quality Checks / Test on Python 3.11 (push) Waiting to run
Tests & Quality Checks / Test on Python 3.12 (push) Waiting to run
Tests & Quality Checks / Test on Python 3.11-1 (push) Waiting to run
Tests & Quality Checks / Test on Python 3.12-1 (push) Waiting to run
Tests & Quality Checks / Test on Python 3.10 (push) Waiting to run
Tests & Quality Checks / Test on Python 3.11-2 (push) Waiting to run
Tests & Quality Checks / Test on Python 3.12-2 (push) Waiting to run
Tests & Quality Checks / Build Artifacts (push) Blocked by required conditions
Tests & Quality Checks / Build Artifacts-1 (push) Blocked by required conditions
- Replace token-based auth with HTTP Basic Auth (username/password) - Scripts now use FORGEJO_USER and FORGEJO_PASS environment variables - Same credentials used for git repository access - No special token creation needed - Simpler setup: set env vars and run upload script - Both Windows and macOS scripts updated
This commit is contained in:
parent
1b37335f8a
commit
e4a3a9a2cc
3 changed files with 80 additions and 177 deletions
|
|
@ -1,88 +1,53 @@
|
|||
#!/bin/bash
|
||||
# Upload macOS Build to Forgejo Packages
|
||||
# Usage: ./upload_to_packages.sh -v 1.0.0
|
||||
# Set token via: export FORGEJO_TOKEN="your_token"
|
||||
# Or store in config: ./upload_to_packages.sh --save-token -t "your_token"
|
||||
# Uses your Forgejo credentials (same as git)
|
||||
# Set via: export FORGEJO_USER="username"; export FORGEJO_PASS="password"
|
||||
|
||||
set -e
|
||||
|
||||
# Parse arguments
|
||||
VERSION=""
|
||||
FORGEJO_TOKEN=""
|
||||
FORGEJO_USER=""
|
||||
FORGEJO_PASS=""
|
||||
FORGEJO_URL="https://git.him-tools.de"
|
||||
REPO="HIM-public/webdrop-bridge"
|
||||
DMG_PATH="build/dist/macos/WebDropBridge.dmg"
|
||||
CHECKSUM_PATH="build/dist/macos/WebDropBridge.dmg.sha256"
|
||||
SAVE_TOKEN=false
|
||||
|
||||
while [[ $# -gt 0 ]]; do
|
||||
case $1 in
|
||||
-v|--version) VERSION="$2"; shift 2;;
|
||||
-t|--token) FORGEJO_TOKEN="$2"; shift 2;;
|
||||
-u|--url) FORGEJO_URL="$2"; shift 2;;
|
||||
--save-token) SAVE_TOKEN=true; shift;;
|
||||
*) echo "Unknown option: $1"; exit 1;;
|
||||
esac
|
||||
done
|
||||
|
||||
# Load token from environment or .env file
|
||||
if [ -z "$FORGEJO_TOKEN" ]; then
|
||||
# Check if .env file exists in project root
|
||||
if [ -f ".env" ]; then
|
||||
export $(grep "FORGEJO_TOKEN" .env | xargs)
|
||||
fi
|
||||
# Check if saved in home config
|
||||
if [ -z "$FORGEJO_TOKEN" ] && [ -f "$HOME/.config/webdrop-bridge/.env" ]; then
|
||||
export $(grep "FORGEJO_TOKEN" "$HOME/.config/webdrop-bridge/.env" | xargs)
|
||||
fi
|
||||
# Load credentials from environment
|
||||
if [ -z "$FORGEJO_USER" ]; then
|
||||
FORGEJO_USER="$FORGEJO_USER"
|
||||
fi
|
||||
|
||||
# Handle --save-token flag
|
||||
if [ "$SAVE_TOKEN" = true ]; then
|
||||
if [ -z "$FORGEJO_TOKEN" ]; then
|
||||
read -sp "Enter Forgejo token to save: " FORGEJO_TOKEN
|
||||
echo ""
|
||||
fi
|
||||
mkdir -p "$HOME/.config/webdrop-bridge"
|
||||
echo "FORGEJO_TOKEN=$FORGEJO_TOKEN" > "$HOME/.config/webdrop-bridge/.env"
|
||||
chmod 600 "$HOME/.config/webdrop-bridge/.env"
|
||||
echo "✓ Token saved to $HOME/.config/webdrop-bridge/.env"
|
||||
exit 0
|
||||
if [ -z "$FORGEJO_PASS" ]; then
|
||||
FORGEJO_PASS="$FORGEJO_PASS"
|
||||
fi
|
||||
|
||||
# Verify required parameters
|
||||
if [ -z "$VERSION" ]; then
|
||||
echo "ERROR: Version parameter required" >&2
|
||||
echo "Usage: $0 -v VERSION [-t TOKEN] [-u FORGEJO_URL]" >&2
|
||||
echo "Usage: $0 -v VERSION [-u FORGEJO_URL]" >&2
|
||||
echo "Example: $0 -v 1.0.0" >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [ -z "$FORGEJO_USER" ] || [ -z "$FORGEJO_PASS" ]; then
|
||||
echo "ERROR: Forgejo credentials not found!" >&2
|
||||
echo "" >&2
|
||||
echo "Token can be set via:" >&2
|
||||
echo " 1. Environment: export FORGEJO_TOKEN='your_token'" >&2
|
||||
echo " 2. .env file: FORGEJO_TOKEN=your_token (in project root)" >&2
|
||||
echo " 3. Config: $0 --save-token -t 'your_token'" >&2
|
||||
echo " 4. Parameter: -t 'your_token'" >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [ -z "$FORGEJO_TOKEN" ]; then
|
||||
echo "ERROR: Forgejo token not found!" >&2
|
||||
echo "Set your credentials using environment variables:" >&2
|
||||
echo " export FORGEJO_USER='your_username'" >&2
|
||||
echo " export FORGEJO_PASS='your_password'" >&2
|
||||
echo "" >&2
|
||||
echo "Set token using one of these methods:" >&2
|
||||
echo " 1. Environment: export FORGEJO_TOKEN='your_token'" >&2
|
||||
echo " 2. .env file: FORGEJO_TOKEN=your_token (in project root)" >&2
|
||||
echo " 3. Config: $0 --save-token -t 'your_token'" >&2
|
||||
echo " 4. Parameter: -t 'your_token'" >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Verify files exist
|
||||
if [ ! -f "$DMG_PATH" ]; then
|
||||
echo "ERROR: DMG file not found at $DMG_PATH"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [ ! -f "$CHECKSUM_PATH" ]; then
|
||||
echo "ERROR: Checksum file not found at $CHECKSUM_PATH"
|
||||
echo "These should match your Forgejo login credentials." >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
|
|
@ -95,13 +60,16 @@ CHECKSUM=$(cat "$CHECKSUM_PATH")
|
|||
echo "File: WebDropBridge.dmg ($DMG_SIZE MB)"
|
||||
echo "Checksum: ${CHECKSUM:0:16}..."
|
||||
|
||||
# Create basic auth header
|
||||
BASIC_AUTH=$(echo -n "${FORGEJO_USER}:${FORGEJO_PASS}" | base64)
|
||||
|
||||
# Upload DMG
|
||||
echo ""
|
||||
echo "Uploading DMG..."
|
||||
DMG_URL="$FORGEJO_URL/api/v1/repos/$REPO/packages/generic/webdrop-bridge/$VERSION/WebDropBridge.dmg"
|
||||
|
||||
HTTP_CODE=$(curl -s -w "%{http_code}" -X PUT \
|
||||
-H "Authorization: token $FORGEJO_TOKEN" \
|
||||
-H "Authorization: Basic $BASIC_AUTH" \
|
||||
--data-binary "@$DMG_PATH" \
|
||||
-H "Content-Type: application/octet-stream" \
|
||||
"$DMG_URL" \
|
||||
|
|
@ -120,7 +88,7 @@ echo "Uploading checksum..."
|
|||
CHECKSUM_URL="$FORGEJO_URL/api/v1/repos/$REPO/packages/generic/webdrop-bridge/$VERSION/WebDropBridge.dmg.sha256"
|
||||
|
||||
HTTP_CODE=$(curl -s -w "%{http_code}" -X PUT \
|
||||
-H "Authorization: token $FORGEJO_TOKEN" \
|
||||
-H "Authorization: Basic $BASIC_AUTH" \
|
||||
-d "$CHECKSUM" \
|
||||
-H "Content-Type: text/plain" \
|
||||
"$CHECKSUM_URL" \
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue