laantungir/ginxsom
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

v0.2.1 - Add arm64 cross-compilation and release support

Browse Source
This commit is contained in:
Laan Tungir
2026-04-23 07:16:17 -04:00
parent fa5f5e60cb
commit 469d2180c1
4 changed files with 456 additions and 243 deletions
Download Patch File Download Diff File Expand all files Collapse all files

110
build_static.sh
View File

@@ -11,8 +11,40 @@ DOCKERFILE="$SCRIPT_DIR/Dockerfile.alpine-musl"
# Parse command line arguments # Parse command line arguments
DEBUG_BUILD=false DEBUG_BUILD=false
if [[ "$1" == "--debug" ]]; then TARGET_ARCH=""
DEBUG_BUILD=true
while [[ $# -gt 0 ]]; do
case "$1" in
--debug)
DEBUG_BUILD=true
shift
;;
--arch)
if [[ -z "$2" ]]; then
echo "ERROR: --arch requires a value"
echo "Usage: $0 [--debug] [--arch <arm64|armv7|x86_64>]"
exit 1
fi
case "$2" in
arm64|armv7|x86_64)
TARGET_ARCH="$2"
;;
*)
echo "ERROR: Unsupported architecture '$2'"
echo "Supported values: arm64, armv7, x86_64"
exit 1
esac
shift 2
;;
*)
echo "ERROR: Unknown argument '$1'"
echo "Usage: $0 [--debug] [--arch <arm64|armv7|x86_64>]"
exit 1
;;
esac
done
if [ "$DEBUG_BUILD" = true ]; then
echo "==========================================" echo "=========================================="
echo "Ginxsom MUSL Static Binary Builder (DEBUG MODE)" echo "Ginxsom MUSL Static Binary Builder (DEBUG MODE)"
echo "==========================================" echo "=========================================="
@@ -24,6 +56,9 @@ fi
echo "Project directory: $SCRIPT_DIR" echo "Project directory: $SCRIPT_DIR"
echo "Build directory: $BUILD_DIR" echo "Build directory: $BUILD_DIR"
echo "Debug build: $DEBUG_BUILD" echo "Debug build: $DEBUG_BUILD"
if [[ -n "$TARGET_ARCH" ]]; then
echo "Requested target architecture: $TARGET_ARCH"
fi
echo "" echo ""
# Create build directory # Create build directory
@@ -58,17 +93,43 @@ DOCKER_CMD="docker"
echo "✓ Docker is available and running" echo "✓ Docker is available and running"
echo "" echo ""
# Detect architecture # Detect host architecture
ARCH=$(uname -m) ARCH=$(uname -m)
case "$ARCH" in
x86_64)
HOST_ARCH="x86_64"
;;
aarch64|arm64)
HOST_ARCH="arm64"
;;
armv7l|armv7)
HOST_ARCH="armv7"
;;
*)
HOST_ARCH="unknown"
;;
esac
# Resolve target architecture
if [[ -n "$TARGET_ARCH" ]]; then
ARCH="$TARGET_ARCH"
fi
case "$ARCH" in case "$ARCH" in
x86_64) x86_64)
PLATFORM="linux/amd64" PLATFORM="linux/amd64"
OUTPUT_NAME="ginxsom-fcgi_static_x86_64" OUTPUT_NAME="ginxsom-fcgi_static_x86_64"
;; ;;
aarch64|arm64) aarch64|arm64)
ARCH="arm64"
PLATFORM="linux/arm64" PLATFORM="linux/arm64"
OUTPUT_NAME="ginxsom-fcgi_static_arm64" OUTPUT_NAME="ginxsom-fcgi_static_arm64"
;; ;;
armv7l|armv7)
ARCH="armv7"
PLATFORM="linux/arm/v7"
OUTPUT_NAME="ginxsom-fcgi_static_armv7"
;;
*) *)
echo "WARNING: Unknown architecture: $ARCH" echo "WARNING: Unknown architecture: $ARCH"
echo "Defaulting to linux/amd64" echo "Defaulting to linux/amd64"
@@ -77,10 +138,51 @@ case "$ARCH" in
;; ;;
esac esac
# When cross-building, ensure buildx exists and warn about QEMU/binfmt setup
if [[ "$HOST_ARCH" != "unknown" && "$ARCH" != "$HOST_ARCH" ]]; then
echo "NOTE: Cross-building from host '$HOST_ARCH' to target '$ARCH'."
echo " Docker QEMU/binfmt support is required for this to work."
if ! docker buildx version >/dev/null 2>&1; then
echo "ERROR: docker buildx is required for cross-architecture builds but is not available."
echo "Install/enable buildx and binfmt support, then retry."
exit 1
fi
echo "✓ docker buildx is available for cross-architecture build"
echo ""
fi
# Append _debug suffix to output name for debug builds so production binary is never overwritten
if [ "$DEBUG_BUILD" = true ]; then
OUTPUT_NAME="${OUTPUT_NAME}_debug"
fi
echo "Building for platform: $PLATFORM" echo "Building for platform: $PLATFORM"
echo "Output binary: $OUTPUT_NAME" echo "Output binary: $OUTPUT_NAME"
echo "" echo ""
# Check if Alpine base image is cached
echo "Checking for cached Alpine Docker image..."
if ! docker images alpine:3.19 --format "{{.Repository}}:{{.Tag}}" | grep -q "alpine:3.19"; then
echo "⚠ Alpine 3.19 image not found in cache"
echo "Attempting to pull Alpine 3.19 image..."
if ! docker pull alpine:3.19; then
echo ""
echo "ERROR: Failed to pull Alpine 3.19 image"
echo "This is required for the static build."
echo ""
echo "Possible solutions:"
echo " 1. Check your internet connection"
echo " 2. Try again later (Docker Hub may be temporarily unavailable)"
echo " 3. If you have IPv6 issues, disable IPv6 for Docker"
echo ""
exit 1
fi
echo "✓ Alpine 3.19 image pulled successfully"
else
echo "✓ Alpine 3.19 image found in cache"
fi
echo ""
# Build the Docker image # Build the Docker image
echo "==========================================" echo "=========================================="
echo "Step 1: Building Alpine Docker image" echo "Step 1: Building Alpine Docker image"
@@ -220,4 +322,4 @@ fi
echo "" echo ""
echo "Deployment:" echo "Deployment:"
echo " scp $BUILD_DIR/$OUTPUT_NAME user@server:/path/to/ginxsom/" echo " scp $BUILD_DIR/$OUTPUT_NAME user@server:/path/to/ginxsom/"
echo "" echo ""

BIN
ginxsom-fcgi-linux-x86_64
View File

Binary file not shown.

585
increment_and_push.sh
View File

@@ -8,18 +8,66 @@ YELLOW='\033[1;33m'
BLUE='\033[0;34m' BLUE='\033[0;34m'
NC='\033[0m' NC='\033[0m'
print_status() { echo -e "${BLUE}[INFO]${NC} $1"; } print_status() { echo -e "${BLUE}[INFO]${NC} $1" >&2; }
print_success() { echo -e "${GREEN}[SUCCESS]${NC} $1"; } print_success() { echo -e "${GREEN}[SUCCESS]${NC} $1" >&2; }
print_warning() { echo -e "${YELLOW}[WARNING]${NC} $1"; } print_warning() { echo -e "${YELLOW}[WARNING]${NC} $1" >&2; }
print_error() { echo -e "${RED}[ERROR]${NC} $1"; } print_error() { echo -e "${RED}[ERROR]${NC} $1" >&2; }
# Global variables # Global variables
COMMIT_MESSAGE="" COMMIT_MESSAGE=""
RELEASE_MODE=false RELEASE_MODE=false
VERSION_INCREMENT_TYPE="patch" # "patch", "minor", or "major"
VERSION_INCREMENT_EXPLICIT=false
# TODO: Update this URL to match your actual Gitea repository
GITEA_REPO_URL="https://git.laantungir.net/api/v1/repos/laantungir/ginxsom" GITEA_REPO_URL="https://git.laantungir.net/api/v1/repos/laantungir/ginxsom"
show_usage() {
echo "Ginxsom Increment and Push Script"
echo ""
echo "USAGE:"
echo " $0 [OPTIONS] \"commit message\""
echo ""
echo "COMMANDS:"
echo " $0 \"commit message\" Default: increment patch, commit & push"
echo " $0 -p \"commit message\" Increment patch version"
echo " $0 -m \"commit message\" Increment minor version"
echo " $0 -M \"commit message\" Increment major version"
echo " $0 -r \"commit message\" Create release with assets (no version increment)"
echo " $0 -r -p \"commit message\" Create release with patch version increment"
echo " $0 -r -m \"commit message\" Create release with minor version increment"
echo " $0 -h Show this help message"
echo ""
echo "OPTIONS:"
echo " -p, --patch Increment patch version (default)"
echo " -m, --minor Increment minor version"
echo " -M, --major Increment major version"
echo " -r, --release Create release with assets"
echo " -h, --help Show this help message"
echo ""
echo "EXAMPLES:"
echo " $0 \"Fixed authentication bug\""
echo " $0 -m \"Added new features\""
echo " $0 -M \"Breaking API changes\""
echo " $0 -r \"Release current version\""
echo " $0 -r -p \"Release with patch increment\""
echo " $0 -r -m \"Release with minor increment\""
echo ""
echo "VERSION INCREMENT MODES:"
echo " -p, --patch (default): Increment patch version (v1.2.3 → v1.2.4)"
echo " -m, --minor: Increment minor version, zero patch (v1.2.3 → v1.3.0)"
echo " -M, --major: Increment major version, zero minor+patch (v1.2.3 → v2.0.0)"
echo ""
echo "RELEASE MODE (-r flag):"
echo " - Build static binaries for x86_64 and ARM64 using build_static.sh"
echo " - Create source tarball"
echo " - Git add, commit, push, and create Gitea release with assets"
echo " - Can be combined with version increment flags"
echo ""
echo "REQUIREMENTS FOR RELEASE MODE:"
echo " - Gitea token in ~/.gitea_token for release uploads"
echo " - Docker installed for static binary builds"
}
# Parse command line arguments # Parse command line arguments
while [[ $# -gt 0 ]]; do while [[ $# -gt 0 ]]; do
case $1 in case $1 in
@@ -27,6 +75,21 @@ while [[ $# -gt 0 ]]; do
RELEASE_MODE=true RELEASE_MODE=true
shift shift
;; ;;
-p|--patch)
VERSION_INCREMENT_TYPE="patch"
VERSION_INCREMENT_EXPLICIT=true
shift
;;
-m|--minor)
VERSION_INCREMENT_TYPE="minor"
VERSION_INCREMENT_EXPLICIT=true
shift
;;
-M|--major)
VERSION_INCREMENT_TYPE="major"
VERSION_INCREMENT_EXPLICIT=true
shift
;;
-h|--help) -h|--help)
show_usage show_usage
exit 0 exit 0
@@ -41,32 +104,6 @@ while [[ $# -gt 0 ]]; do
esac esac
done done
show_usage() {
echo "Ginxsom Build and Push Script"
echo ""
echo "Usage:"
echo " $0 \"commit message\" - Default: compile, increment patch, commit & push"
echo " $0 -r \"commit message\" - Release: compile, increment minor, create release"
echo ""
echo "Examples:"
echo " $0 \"Fixed authentication bug\""
echo " $0 --release \"Major release with admin API\""
echo ""
echo "Default Mode (patch increment):"
echo " - Compile Ginxsom FastCGI server"
echo " - Increment patch version (v1.2.3 → v1.2.4)"
echo " - Git add, commit with message, and push"
echo ""
echo "Release Mode (-r flag):"
echo " - Compile Ginxsom FastCGI server"
echo " - Increment minor version, zero patch (v1.2.3 → v1.3.0)"
echo " - Git add, commit, push, and create Gitea release"
echo ""
echo "Requirements for Release Mode:"
echo " - Gitea token in ~/.gitea_token for release uploads"
echo " - Update GITEA_REPO_URL in script for your repository"
}
# Validate inputs # Validate inputs
if [[ -z "$COMMIT_MESSAGE" ]]; then if [[ -z "$COMMIT_MESSAGE" ]]; then
print_error "Commit message is required" print_error "Commit message is required"
@@ -85,20 +122,20 @@ check_git_repo() {
# Function to get current version and increment appropriately # Function to get current version and increment appropriately
increment_version() { increment_version() {
local increment_type="$1" # "patch" or "minor" local increment_type="$1" # "patch", "minor", or "major"
print_status "Getting current version..." print_status "Getting current version..."
# Get the highest version tag (not chronologically latest) # Get the highest version tag (not chronologically latest)
LATEST_TAG=$(git tag -l 'v*.*.*' | sort -V | tail -n 1 || echo "") LATEST_TAG=$(git tag -l 'v*.*.*' | sort -V | tail -n 1 || echo "")
if [[ -z "$LATEST_TAG" ]]; then if [[ -z "$LATEST_TAG" ]]; then
LATEST_TAG="v0.0.0" LATEST_TAG="v0.0.0"
print_warning "No version tags found, starting from $LATEST_TAG" print_warning "No version tags found, starting from $LATEST_TAG"
fi fi
# Extract version components (remove 'v' prefix) # Extract version components (remove 'v' prefix)
VERSION=${LATEST_TAG#v} VERSION=${LATEST_TAG#v}
# Parse major.minor.patch using regex # Parse major.minor.patch using regex
if [[ $VERSION =~ ^([0-9]+)\.([0-9]+)\.([0-9]+)$ ]]; then if [[ $VERSION =~ ^([0-9]+)\.([0-9]+)\.([0-9]+)$ ]]; then
MAJOR=${BASH_REMATCH[1]} MAJOR=${BASH_REMATCH[1]}
@@ -109,113 +146,74 @@ increment_version() {
print_error "Expected format: v0.1.0" print_error "Expected format: v0.1.0"
exit 1 exit 1
fi fi
# Increment version based on type # Increment version based on type
if [[ "$increment_type" == "minor" ]]; then if [[ "$increment_type" == "major" ]]; then
# Minor release: increment minor, zero patch NEW_MAJOR=$((MAJOR + 1))
NEW_MINOR=0
NEW_PATCH=0
NEW_VERSION="v${NEW_MAJOR}.${NEW_MINOR}.${NEW_PATCH}"
print_status "Major version increment: incrementing major version"
elif [[ "$increment_type" == "minor" ]]; then
NEW_MAJOR=$MAJOR
NEW_MINOR=$((MINOR + 1)) NEW_MINOR=$((MINOR + 1))
NEW_PATCH=0 NEW_PATCH=0
NEW_VERSION="v${MAJOR}.${NEW_MINOR}.${NEW_PATCH}" NEW_VERSION="v${NEW_MAJOR}.${NEW_MINOR}.${NEW_PATCH}"
print_status "Release mode: incrementing minor version" print_status "Minor version increment: incrementing minor version"
else else
# Default: increment patch NEW_MAJOR=$MAJOR
NEW_MINOR=$MINOR
NEW_PATCH=$((PATCH + 1)) NEW_PATCH=$((PATCH + 1))
NEW_VERSION="v${MAJOR}.${MINOR}.${NEW_PATCH}" NEW_VERSION="v${NEW_MAJOR}.${NEW_MINOR}.${NEW_PATCH}"
print_status "Default mode: incrementing patch version" print_status "Patch version increment: incrementing patch version"
fi fi
print_status "Current version: $LATEST_TAG" print_status "Current version: $LATEST_TAG"
print_status "New version: $NEW_VERSION" print_status "New version: $NEW_VERSION"
# Update version in src/ginxsom.h
update_version_in_header "$NEW_VERSION" "$NEW_MAJOR" "$NEW_MINOR" "$NEW_PATCH"
# Export for use in other functions # Export for use in other functions
export NEW_VERSION export NEW_VERSION
} }
# Function to update version in header file # Function to update version macros in src/ginxsom.h
update_version_in_header() { update_version_in_header() {
local version="$1" local new_version="$1"
print_status "Updating version in src/ginxsom.h to $version..." local major="$2"
local minor="$3"
local patch="$4"
# Extract version components (remove 'v' prefix) print_status "Updating version in src/ginxsom.h..."
local version_no_v=${version#v}
# Parse major.minor.patch using regex if [[ ! -f "src/ginxsom.h" ]]; then
if [[ $version_no_v =~ ^([0-9]+)\.([0-9]+)\.([0-9]+)$ ]]; then print_error "src/ginxsom.h not found"
local major=${BASH_REMATCH[1]}
local minor=${BASH_REMATCH[2]}
local patch=${BASH_REMATCH[3]}
# Update the header file
sed -i "s/#define VERSION_MAJOR [0-9]\+/#define VERSION_MAJOR $major/" src/ginxsom.h
sed -i "s/#define VERSION_MINOR [0-9]\+/#define VERSION_MINOR $minor/" src/ginxsom.h
sed -i "s/#define VERSION_PATCH [0-9]\+/#define VERSION_PATCH $patch/" src/ginxsom.h
sed -i "s/#define VERSION \"v[0-9]\+\.[0-9]\+\.[0-9]\+\"/#define VERSION \"$version\"/" src/ginxsom.h
print_success "Updated version in header file"
else
print_error "Invalid version format: $version"
exit 1
fi
}
# Function to build the static Ginxsom binary
compile_project() {
print_status "Building static Ginxsom FastCGI binary via build_static.sh..."
if [[ ! -x "./build_static.sh" ]]; then
print_error "build_static.sh not found or not executable"
exit 1 exit 1
fi fi
if ./build_static.sh > /dev/null 2>&1; then sed -i "s/#define VERSION_MAJOR [0-9]\+/#define VERSION_MAJOR $major/" src/ginxsom.h
print_success "Static build completed successfully" sed -i "s/#define VERSION_MINOR [0-9]\+/#define VERSION_MINOR $minor/" src/ginxsom.h
sed -i "s/#define VERSION_PATCH [0-9]\+/#define VERSION_PATCH $patch/" src/ginxsom.h
sed -i "s/#define VERSION \"v[0-9]\+\.[0-9]\+\.[0-9]\+\"/#define VERSION \"$new_version\"/" src/ginxsom.h
# Verify the static binary was created print_success "Updated version in src/ginxsom.h to $new_version"
if [[ -f "build/ginxsom-fcgi_static_x86_64" || -f "build/ginxsom-fcgi_static_arm64" ]]; then
print_success "Static binary created in build/"
else
print_error "Static binary not found after build_static.sh"
exit 1
fi
else
print_error "Static build failed"
exit 1
fi
}
# Function to build release binary
build_release_binary() {
print_status "Preparing release binary from static build output..."
if [[ -f "build/ginxsom-fcgi_static_x86_64" ]]; then
cp build/ginxsom-fcgi_static_x86_64 ginxsom-fcgi-linux-x86_64
print_success "Release binary created: ginxsom-fcgi-linux-x86_64"
elif [[ -f "build/ginxsom-fcgi_static_arm64" ]]; then
cp build/ginxsom-fcgi_static_arm64 ginxsom-fcgi-linux-arm64
print_success "Release binary created: ginxsom-fcgi-linux-arm64"
else
print_error "No static build artifact found in build/"
exit 1
fi
} }
# Function to commit and push changes # Function to commit and push changes
git_commit_and_push() { git_commit_and_push() {
print_status "Preparing git commit..." print_status "Preparing git commit..."
# Stage all changes
if git add . > /dev/null 2>&1; then if git add . > /dev/null 2>&1; then
print_success "Staged all changes" print_success "Staged all changes"
else else
print_error "Failed to stage changes" print_error "Failed to stage changes"
exit 1 exit 1
fi fi
# Check if there are changes to commit
if git diff --staged --quiet; then if git diff --staged --quiet; then
print_warning "No changes to commit" print_warning "No changes to commit"
else else
# Commit changes
if git commit -m "$NEW_VERSION - $COMMIT_MESSAGE" > /dev/null 2>&1; then if git commit -m "$NEW_VERSION - $COMMIT_MESSAGE" > /dev/null 2>&1; then
print_success "Committed changes" print_success "Committed changes"
else else
@@ -223,15 +221,13 @@ git_commit_and_push() {
exit 1 exit 1
fi fi
fi fi
# Create new git tag
if git tag "$NEW_VERSION" > /dev/null 2>&1; then if git tag "$NEW_VERSION" > /dev/null 2>&1; then
print_success "Created tag: $NEW_VERSION" print_success "Created tag: $NEW_VERSION"
else else
print_warning "Tag $NEW_VERSION already exists" print_warning "Tag $NEW_VERSION already exists"
fi fi
# Push changes and tags
print_status "Pushing to remote repository..." print_status "Pushing to remote repository..."
if git push > /dev/null 2>&1; then if git push > /dev/null 2>&1; then
print_success "Pushed changes" print_success "Pushed changes"
@@ -239,8 +235,7 @@ git_commit_and_push() {
print_error "Failed to push changes" print_error "Failed to push changes"
exit 1 exit 1
fi fi
# Push only the new tag to avoid conflicts with existing tags
if git push origin "$NEW_VERSION" > /dev/null 2>&1; then if git push origin "$NEW_VERSION" > /dev/null 2>&1; then
print_success "Pushed tag: $NEW_VERSION" print_success "Pushed tag: $NEW_VERSION"
else else
@@ -257,20 +252,17 @@ git_commit_and_push() {
# Function to commit and push changes without creating a tag (tag already created) # Function to commit and push changes without creating a tag (tag already created)
git_commit_and_push_no_tag() { git_commit_and_push_no_tag() {
print_status "Preparing git commit..." print_status "Preparing git commit..."
# Stage all changes
if git add . > /dev/null 2>&1; then if git add . > /dev/null 2>&1; then
print_success "Staged all changes" print_success "Staged all changes"
else else
print_error "Failed to stage changes" print_error "Failed to stage changes"
exit 1 exit 1
fi fi
# Check if there are changes to commit
if git diff --staged --quiet; then if git diff --staged --quiet; then
print_warning "No changes to commit" print_warning "No changes to commit"
else else
# Commit changes
if git commit -m "$NEW_VERSION - $COMMIT_MESSAGE" > /dev/null 2>&1; then if git commit -m "$NEW_VERSION - $COMMIT_MESSAGE" > /dev/null 2>&1; then
print_success "Committed changes" print_success "Committed changes"
else else
@@ -278,8 +270,7 @@ git_commit_and_push_no_tag() {
exit 1 exit 1
fi fi
fi fi
# Push changes and tags
print_status "Pushing to remote repository..." print_status "Pushing to remote repository..."
if git push > /dev/null 2>&1; then if git push > /dev/null 2>&1; then
print_success "Pushed changes" print_success "Pushed changes"
@@ -287,8 +278,7 @@ git_commit_and_push_no_tag() {
print_error "Failed to push changes" print_error "Failed to push changes"
exit 1 exit 1
fi fi
# Push only the new tag to avoid conflicts with existing tags
if git push origin "$NEW_VERSION" > /dev/null 2>&1; then if git push origin "$NEW_VERSION" > /dev/null 2>&1; then
print_success "Pushed tag: $NEW_VERSION" print_success "Pushed tag: $NEW_VERSION"
else else
@@ -302,42 +292,193 @@ git_commit_and_push_no_tag() {
fi fi
} }
# Function to build release binaries
build_release_binary() {
print_status "Building release binaries..."
if [[ ! -f "build_static.sh" ]]; then
print_error "build_static.sh not found"
return 1
fi
# Build x86_64 first (required for success)
if ./build_static.sh > /dev/null 2>&1; then
print_success "Built x86_64 static binary successfully"
else
print_error "Failed to build x86_64 static binary"
return 1
fi
# Build arm64 second (warning-only on failure)
if ./build_static.sh --arch arm64 > /dev/null 2>&1; then
print_success "Built ARM64 static binary successfully"
else
print_warning "Failed to build ARM64 static binary (continuing with release)"
fi
return 0
}
# Function to create source tarball
create_source_tarball() {
print_status "Creating source tarball..."
local tarball_name="ginxsom-${NEW_VERSION#v}.tar.gz"
if tar -czf "$tarball_name" \
--exclude='build/*' \
--exclude='.git*' \
--exclude='*.db' \
--exclude='*.db-*' \
--exclude='*.log' \
--exclude='*.tar.gz' \
--exclude='Trash/*' \
. > /dev/null 2>&1; then
print_success "Created source tarball: $tarball_name"
echo "$tarball_name"
return 0
else
print_error "Failed to create source tarball"
return 1
fi
}
# Function to upload release assets to Gitea
upload_release_assets() {
local release_id="$1"
local binary_path_x86="$2"
local tarball_path="$3"
local binary_path_arm64="$4"
print_status "Uploading release assets..."
if [[ ! -f "$HOME/.gitea_token" ]]; then
print_warning "No ~/.gitea_token found. Skipping asset uploads."
return 0
fi
local token=$(cat "$HOME/.gitea_token" | tr -d '\n\r')
local assets_url="$GITEA_REPO_URL/releases/$release_id/assets"
print_status "Assets URL: $assets_url"
# Upload x86_64 binary
if [[ -f "$binary_path_x86" ]]; then
print_status "Uploading binary: $(basename "$binary_path_x86")"
local max_attempts=3
local attempt=1
while [[ $attempt -le $max_attempts ]]; do
print_status "Upload attempt $attempt/$max_attempts"
local binary_response=$(curl -fS -X POST "$assets_url" \
-H "Authorization: token $token" \
-F "attachment=@$binary_path_x86;filename=$(basename "$binary_path_x86")" \
-F "name=$(basename "$binary_path_x86")")
if echo "$binary_response" | grep -q '"id"'; then
print_success "Uploaded x86_64 binary successfully"
break
else
print_warning "Upload attempt $attempt failed"
if [[ $attempt -lt $max_attempts ]]; then
print_status "Retrying in 2 seconds..."
sleep 2
else
print_error "Failed to upload x86_64 binary after $max_attempts attempts"
print_error "Response: $binary_response"
fi
fi
((attempt++))
done
fi
# Upload ARM64 binary
if [[ -f "$binary_path_arm64" ]]; then
print_status "Uploading binary: $(basename "$binary_path_arm64")"
local max_attempts=3
local attempt=1
while [[ $attempt -le $max_attempts ]]; do
print_status "Upload attempt $attempt/$max_attempts"
local binary_response=$(curl -fS -X POST "$assets_url" \
-H "Authorization: token $token" \
-F "attachment=@$binary_path_arm64;filename=$(basename "$binary_path_arm64")" \
-F "name=$(basename "$binary_path_arm64")")
if echo "$binary_response" | grep -q '"id"'; then
print_success "Uploaded ARM64 binary successfully"
break
else
print_warning "Upload attempt $attempt failed"
if [[ $attempt -lt $max_attempts ]]; then
print_status "Retrying in 2 seconds..."
sleep 2
else
print_error "Failed to upload ARM64 binary after $max_attempts attempts"
print_error "Response: $binary_response"
fi
fi
((attempt++))
done
fi
# Upload source tarball
if [[ -f "$tarball_path" ]]; then
print_status "Uploading source tarball: $(basename "$tarball_path")"
local tarball_response=$(curl -s -X POST "$GITEA_REPO_URL/releases/$release_id/assets" \
-H "Authorization: token $token" \
-F "attachment=@$tarball_path;filename=$(basename "$tarball_path")")
if echo "$tarball_response" | grep -q '"id"'; then
print_success "Uploaded source tarball successfully"
else
print_warning "Failed to upload source tarball: $tarball_response"
fi
fi
}
# Function to create Gitea release # Function to create Gitea release
create_gitea_release() { create_gitea_release() {
print_status "Creating Gitea release..." print_status "Creating Gitea release..."
# Check for Gitea token
if [[ ! -f "$HOME/.gitea_token" ]]; then if [[ ! -f "$HOME/.gitea_token" ]]; then
print_warning "No ~/.gitea_token found. Skipping release creation." print_warning "No ~/.gitea_token found. Skipping release creation."
print_warning "Create ~/.gitea_token with your Gitea access token to enable releases." print_warning "Create ~/.gitea_token with your Gitea access token to enable releases."
return 0 return 0
fi fi
local token=$(cat "$HOME/.gitea_token" | tr -d '\n\r') local token=$(cat "$HOME/.gitea_token" | tr -d '\n\r')
# Create release
print_status "Creating release $NEW_VERSION..." print_status "Creating release $NEW_VERSION..."
local response=$(curl -s -X POST "$GITEA_REPO_URL/releases" \ local response=$(curl -s -X POST "$GITEA_REPO_URL/releases" \
-H "Authorization: token $token" \ -H "Authorization: token $token" \
-H "Content-Type: application/json" \ -H "Content-Type: application/json" \
-d "{\"tag_name\": \"$NEW_VERSION\", \"name\": \"$NEW_VERSION\", \"body\": \"$COMMIT_MESSAGE\"}") -d "{\"tag_name\": \"$NEW_VERSION\", \"name\": \"$NEW_VERSION\", \"body\": \"$COMMIT_MESSAGE\"}")
if echo "$response" | grep -q '"id"'; then if echo "$response" | grep -q '"id"'; then
print_success "Created release $NEW_VERSION" print_success "Created release $NEW_VERSION"
upload_release_binary "$token" local release_id=$(echo "$response" | grep -o '"id":[0-9]*' | head -1 | cut -d':' -f2)
echo $release_id
elif echo "$response" | grep -q "already exists"; then elif echo "$response" | grep -q "already exists"; then
print_warning "Release $NEW_VERSION already exists" print_warning "Release $NEW_VERSION already exists"
upload_release_binary "$token" local check_response=$(curl -s -H "Authorization: token $token" "$GITEA_REPO_URL/releases/tags/$NEW_VERSION")
if echo "$check_response" | grep -q '"id"'; then
local release_id=$(echo "$check_response" | grep -o '"id":[0-9]*' | head -1 | cut -d':' -f2)
print_status "Using existing release ID: $release_id"
echo $release_id
else
print_error "Could not find existing release ID"
return 1
fi
else else
print_error "Failed to create release $NEW_VERSION" print_error "Failed to create release $NEW_VERSION"
print_error "Response: $response" print_error "Response: $response"
# Try to check if the release exists anyway
print_status "Checking if release exists..." print_status "Checking if release exists..."
local check_response=$(curl -s -H "Authorization: token $token" "$GITEA_REPO_URL/releases/tags/$NEW_VERSION") local check_response=$(curl -s -H "Authorization: token $token" "$GITEA_REPO_URL/releases/tags/$NEW_VERSION")
if echo "$check_response" | grep -q '"id"'; then if echo "$check_response" | grep -q '"id"'; then
print_warning "Release exists but creation response was unexpected" print_warning "Release exists but creation response was unexpected"
upload_release_binary "$token" local release_id=$(echo "$check_response" | grep -o '"id":[0-9]*' | head -1 | cut -d':' -f2)
echo $release_id
else else
print_error "Release does not exist and creation failed" print_error "Release does not exist and creation failed"
return 1 return 1
@@ -345,78 +486,26 @@ create_gitea_release() {
fi fi
} }
# Function to upload release binary
upload_release_binary() {
local token="$1"
# Get release ID with more robust parsing
print_status "Getting release ID for $NEW_VERSION..."
local response=$(curl -s -H "Authorization: token $token" "$GITEA_REPO_URL/releases/tags/$NEW_VERSION")
local release_id=$(echo "$response" | grep -o '"id":[0-9]*' | head -n1 | cut -d: -f2)
if [[ -z "$release_id" ]]; then
print_error "Could not get release ID for $NEW_VERSION"
print_error "API Response: $response"
# Try to list all releases to debug
print_status "Available releases:"
curl -s -H "Authorization: token $token" "$GITEA_REPO_URL/releases" | grep -o '"tag_name":"[^"]*"' | head -5
return 1
fi
print_success "Found release ID: $release_id"
# Upload FastCGI binary
if [[ -f "ginxsom-fcgi-linux-x86_64" ]]; then
print_status "Uploading Ginxsom FastCGI binary..."
if curl -s -X POST "$GITEA_REPO_URL/releases/$release_id/assets" \
-H "Authorization: token $token" \
-F "attachment=@ginxsom-fcgi-linux-x86_64;filename=ginxsom-fcgi-${NEW_VERSION}-linux-x86_64" > /dev/null; then
print_success "Uploaded FastCGI binary"
else
print_warning "Failed to upload FastCGI binary"
fi
fi
if [[ -f "ginxsom-fcgi-linux-arm64" ]]; then
print_status "Uploading Ginxsom ARM64 FastCGI binary..."
if curl -s -X POST "$GITEA_REPO_URL/releases/$release_id/assets" \
-H "Authorization: token $token" \
-F "attachment=@ginxsom-fcgi-linux-arm64;filename=ginxsom-fcgi-${NEW_VERSION}-linux-arm64" > /dev/null; then
print_success "Uploaded ARM64 FastCGI binary"
else
print_warning "Failed to upload ARM64 FastCGI binary"
fi
fi
}
# Function to clean up release binary
cleanup_release_binary() {
if [[ -f "ginxsom-fcgi-linux-x86_64" ]]; then
rm -f ginxsom-fcgi-linux-x86_64
print_status "Cleaned up release binary"
fi
if [[ -f "ginxsom-fcgi-linux-arm64" ]]; then
rm -f ginxsom-fcgi-linux-arm64
print_status "Cleaned up ARM64 release binary"
fi
}
# Main execution # Main execution
main() { main() {
print_status "Ginxsom Build and Push Script" print_status "Ginxsom Increment and Push Script"
# Check prerequisites # Check prerequisites
check_git_repo check_git_repo
if [[ "$RELEASE_MODE" == true ]]; then if [[ "$RELEASE_MODE" == true ]]; then
print_status "=== RELEASE MODE ===" print_status "=== RELEASE MODE ==="
# Increment minor version for releases # Only increment version if explicitly requested
increment_version "minor" if [[ "$VERSION_INCREMENT_EXPLICIT" == true ]]; then
increment_version "$VERSION_INCREMENT_TYPE"
# Create new git tag BEFORE compilation else
LATEST_TAG=$(git tag -l 'v*.*.*' | sort -V | tail -n 1 || echo "v0.0.0")
NEW_VERSION="$LATEST_TAG"
export NEW_VERSION
fi
# Create new git tag BEFORE compilation so version is picked up
if git tag "$NEW_VERSION" > /dev/null 2>&1; then if git tag "$NEW_VERSION" > /dev/null 2>&1; then
print_success "Created tag: $NEW_VERSION" print_success "Created tag: $NEW_VERSION"
else else
@@ -424,35 +513,63 @@ main() {
git tag -d "$NEW_VERSION" > /dev/null 2>&1 git tag -d "$NEW_VERSION" > /dev/null 2>&1
git tag "$NEW_VERSION" > /dev/null 2>&1 git tag "$NEW_VERSION" > /dev/null 2>&1
fi fi
# Update version in header file
update_version_in_header "$NEW_VERSION"
# Compile project
compile_project
# Build release binary
build_release_binary
# Commit and push (but skip tag creation since we already did it) # Commit and push (but skip tag creation since we already did it)
git_commit_and_push_no_tag git_commit_and_push_no_tag
# Create Gitea release with binary # Build release binaries
create_gitea_release local binary_path_x86=""
local binary_path_arm64=""
# Cleanup if build_release_binary; then
cleanup_release_binary if [[ -f "build/ginxsom-fcgi_static_x86_64" ]]; then
binary_path_x86="build/ginxsom-fcgi_static_x86_64"
print_success "Release $NEW_VERSION completed successfully!" fi
print_status "Binary uploaded to Gitea release" if [[ -f "build/ginxsom-fcgi_static_arm64" ]]; then
binary_path_arm64="build/ginxsom-fcgi_static_arm64"
fi
else
print_warning "x86_64 binary build failed, continuing with release creation"
if [[ -f "build/ginxsom-fcgi_static_x86_64" ]]; then
print_status "Using existing x86_64 binary from previous build"
binary_path_x86="build/ginxsom-fcgi_static_x86_64"
fi
if [[ -f "build/ginxsom-fcgi_static_arm64" ]]; then
print_status "Using existing ARM64 binary from previous build"
binary_path_arm64="build/ginxsom-fcgi_static_arm64"
fi
fi
# Create source tarball
local tarball_path=""
if tarball_path=$(create_source_tarball); then
: # tarball_path is set by the function
else
print_warning "Source tarball creation failed, continuing with release creation"
fi
# Create Gitea release
local release_id=""
if release_id=$(create_gitea_release); then
if [[ "$release_id" =~ ^[0-9]+$ ]]; then
if [[ -n "$release_id" && (-n "$binary_path_x86" || -n "$binary_path_arm64" || -n "$tarball_path") ]]; then
upload_release_assets "$release_id" "$binary_path_x86" "$tarball_path" "$binary_path_arm64"
fi
print_success "Release $NEW_VERSION completed successfully!"
else
print_error "Invalid release_id: $release_id"
exit 1
fi
else
print_error "Release creation failed"
fi
else else
print_status "=== DEFAULT MODE ===" print_status "=== DEFAULT MODE ==="
# Increment patch version for regular commits # Increment version based on type (default to patch)
increment_version "patch" increment_version "$VERSION_INCREMENT_TYPE"
# Create new git tag BEFORE compilation # Create new git tag BEFORE compilation so version is picked up
if git tag "$NEW_VERSION" > /dev/null 2>&1; then if git tag "$NEW_VERSION" > /dev/null 2>&1; then
print_success "Created tag: $NEW_VERSION" print_success "Created tag: $NEW_VERSION"
else else
@@ -460,17 +577,11 @@ main() {
git tag -d "$NEW_VERSION" > /dev/null 2>&1 git tag -d "$NEW_VERSION" > /dev/null 2>&1
git tag "$NEW_VERSION" > /dev/null 2>&1 git tag "$NEW_VERSION" > /dev/null 2>&1
fi fi
# Update version in header file
update_version_in_header "$NEW_VERSION"
# Compile project
compile_project
# Commit and push (but skip tag creation since we already did it) # Commit and push (but skip tag creation since we already did it)
git_commit_and_push_no_tag git_commit_and_push_no_tag
print_success "Build and push completed successfully!" print_success "Increment and push completed successfully!"
print_status "Version $NEW_VERSION pushed to repository" print_status "Version $NEW_VERSION pushed to repository"
fi fi
} }

4
src/ginxsom.h
View File

@@ -10,8 +10,8 @@
// Version information (auto-updated by build system) // Version information (auto-updated by build system)
#define VERSION_MAJOR 0 #define VERSION_MAJOR 0
#define VERSION_MINOR 2 #define VERSION_MINOR 2
#define VERSION_PATCH 0 #define VERSION_PATCH 1
#define VERSION "v0.2.0" #define VERSION "v0.2.1"
#include <stddef.h> #include <stddef.h>
#include <stdint.h> #include <stdint.h>