...

Author: despiegk

.github/workflows/release-osx.yaml

@@ -2,13 +2,6 @@ on:
   push:
     tags:
       - "v*" # Push events to matching v*, i.e. v1.0, v20.15.10
-  workflow_dispatch:
-    inputs:
-      tag_name:
-        description: 'Tag name for release'
-        required: true
-        default: 'v1.0.0'
-
 
 name: Create OSX Release
 
@@ -25,8 +18,8 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
-          tag_name: ${{ github.event.inputs.tag_name || github.ref }}
-          release_name: Release ${{ github.event.inputs.tag_name || github.ref }} - OSX
+          tag_name: ${{ github.ref }}
+          release_name: Release ${{ github.ref }} - OSX
           draft: false
           prerelease: false
 
@@ -42,6 +35,10 @@ jobs:
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
+      - name: Setup build environment
+        run: |
+          # Install required build tools for macOS
+          brew install llvm
       - name: Install Rust toolchain
         uses: actions-rs/toolchain@v1
         with:
@@ -50,6 +47,9 @@ jobs:
           override: true
       - name: Build release
         uses: actions-rs/cargo@v1
+        env:
+          CC: clang
+          CXX: clang++
         with:
           command: build
           args: --release --target=${{ matrix.target }}

release_zinit.sh

@@ -0,0 +1,97 @@
+#!/bin/bash
+
+# Navigate to the zinit project directory
+cd /Users/despiegk/code/github/threefoldtech/zinit
+
+# Check if we're in the right directory
+if [ ! -f "Cargo.toml" ]; then
+    echo "Error: Not in zinit project directory"
+    exit 1
+fi
+
+# Function to get the latest release tag from GitHub
+get_latest_release() {
+    local latest_tag=$(curl -s "https://api.github.com/repos/threefoldtech/zinit/releases/latest" | grep '"tag_name":' | sed -E 's/.*"([^"]+)".*/\1/')
+    
+    if [ "$latest_tag" = "null" ] || [ -z "$latest_tag" ]; then
+        echo "v0.0.0"
+    else
+        echo "$latest_tag"
+    fi
+}
+
+# Function to increment version
+increment_version() {
+    local version=$1
+    # Remove 'v' prefix if present
+    version=${version#v}
+    
+    # Split version into parts
+    IFS='.' read -ra PARTS <<< "$version"
+    major=${PARTS[0]:-0}
+    minor=${PARTS[1]:-0}
+    patch=${PARTS[2]:-0}
+    
+    # Increment patch (maintenance) version
+    patch=$((patch + 1))
+    
+    echo "v${major}.${minor}.${patch}"
+}
+
+echo "🔍 Checking latest release..."
+latest_release=$(get_latest_release)
+echo "Latest release: $latest_release"
+
+new_version=$(increment_version "$latest_release")
+echo "New version: $new_version"
+
+# Confirm with user
+read -p "Create release $new_version? (y/N): " -n 1 -r
+echo
+if [[ ! $REPLY =~ ^[Yy]$ ]]; then
+    echo "Release cancelled"
+    exit 0
+fi
+
+# Check if tag already exists locally and remove it
+if git tag -l | grep -q "^$new_version$"; then
+    echo "⚠️  Local tag $new_version already exists, removing it..."
+    git tag -d "$new_version"
+fi
+
+# Make sure we're on the right branch and up to date
+echo "🔄 Updating repository..."
+git fetch origin
+
+# Get current branch name
+current_branch=$(git branch --show-current)
+
+# If we're not on main or master, try to checkout one of them
+if [[ "$current_branch" != "main" && "$current_branch" != "master" ]]; then
+    echo "Current branch: $current_branch"
+    if git show-ref --verify --quiet refs/heads/main; then
+        echo "Switching to main branch..."
+        git checkout main
+        current_branch="main"
+    elif git show-ref --verify --quiet refs/heads/master; then
+        echo "Switching to master branch..."
+        git checkout master
+        current_branch="master"
+    else
+        echo "⚠️  Neither main nor master branch found, staying on current branch: $current_branch"
+    fi
+fi
+
+echo "Pulling latest changes from $current_branch..."
+git pull origin "$current_branch"
+
+# Create and push the tag
+echo "🏷️  Creating tag $new_version..."
+git tag "$new_version"
+
+echo "🚀 Pushing tag to trigger release..."
+git push origin "$new_version"
+
+echo "✅ Release $new_version has been triggered!"
+echo "🔗 Check the release at: https://github.com/threefoldtech/zinit/releases"
+echo "🔗 Monitor the build at: https://github.com/threefoldtech/zinit/actions"