fix: Fixes task release to pull tags before releasing

Author: scalvert

.github/workflows/release.yml

@@ -29,13 +29,13 @@ jobs:
           version: latest
           args: release --clean
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GH_PAT }}
 
       - name: Update Homebrew tap
         if: success()
         uses: dawidd6/action-homebrew-bump-formula@v3
         with:
-          token: ${{ secrets.GITHUB_TOKEN }}
+          token: ${{ secrets.GH_PAT }}
           tap: scalvert/homebrew-tap
           formula: glean-cli
           tag: ${{ github.ref_name }}

.gitignore

@@ -1 +1 @@
-./glean
+glean

install.sh

@@ -31,19 +31,57 @@ trap cleanup EXIT
 
 # Download and extract
 echo "Downloading Glean CLI ${LATEST_VERSION}..."
+echo "Download URL: $DOWNLOAD_URL"
 curl -fsSL "$DOWNLOAD_URL" -o "$TMP_DIR/glean.tar.gz"
+
+echo "Extracting archive..."
+tar -tvf "$TMP_DIR/glean.tar.gz"
 tar -xzf "$TMP_DIR/glean.tar.gz" -C "$TMP_DIR"
 
+echo "Verifying extracted contents..."
+ls -la "$TMP_DIR"
+
 # Install binary
 INSTALL_DIR="/usr/local/bin"
-if [ ! -w "$INSTALL_DIR" ]; then
-  echo "Installing Glean CLI requires sudo access to $INSTALL_DIR"
-  sudo mv "$TMP_DIR/glean" "$INSTALL_DIR/"
-  sudo chmod +x "$INSTALL_DIR/glean"
-else
-  mv "$TMP_DIR/glean" "$INSTALL_DIR/"
+
+# Create install directory if it doesn't exist
+if [ ! -d "$INSTALL_DIR" ]; then
+  echo "Creating $INSTALL_DIR directory..."
+  if ! sudo mkdir -p "$INSTALL_DIR"; then
+    echo "Failed to create $INSTALL_DIR"
+    exit 1
+  fi
+fi
+
+# Set proper ownership for /usr/local/bin if it was just created
+if [ -d "$INSTALL_DIR" ]; then
+  sudo chown -R $(whoami) "$INSTALL_DIR" 2>/dev/null || true
+fi
+
+# Find the glean binary
+GLEAN_BINARY=$(find "$TMP_DIR" -type f -name "glean" -o -name "glean.exe" | head -n 1)
+
+if [ -z "$GLEAN_BINARY" ]; then
+  echo "Error: Could not find glean binary in extracted files"
+  echo "Contents of temp directory:"
+  ls -R "$TMP_DIR"
+  exit 1
+fi
+
+# Attempt installation
+echo "Installing to $INSTALL_DIR..."
+echo "Installing $GLEAN_BINARY to $INSTALL_DIR/glean"
+
+if [ -w "$INSTALL_DIR" ]; then
+  # We have write permission
+  mv "$GLEAN_BINARY" "$INSTALL_DIR/glean"
   chmod +x "$INSTALL_DIR/glean"
+else
+  # We need sudo
+  echo "Elevated permissions required for installation..."
+  sudo mv "$GLEAN_BINARY" "$INSTALL_DIR/glean"
+  sudo chmod +x "$INSTALL_DIR/glean"
 fi
 
-echo "Glean CLI has been installed to $INSTALL_DIR/glean"
+echo "✨ Glean CLI ${LATEST_VERSION} has been installed to $INSTALL_DIR/glean"
 echo "Run 'glean --help' to get started"

taskfile.yml

@@ -43,28 +43,63 @@ tasks:
 
   release:
     desc: Create and push a new release
+    vars:
+      VERSION: '{{.VERSION | default ""}}'
+      FORCE: '{{.FORCE | default "false"}}'
     cmds:
       # Ensure we're on main and up to date
       - git checkout main
       - git pull origin main
+      - git fetch --tags
 
       # Run checks
       - task: check
 
-      # Get the next version
-      - echo "Next version will be $(svu next)"
-      - echo "Press Ctrl+C to cancel or wait 5 seconds to continue..."
-      - sleep 5
+      # Show current version and commits since last release
+      - echo "Current version is $(svu current)"
+      - echo "Commits since last release:"
+      - git log $(svu current)..HEAD --oneline
 
-      # Create and push the tag
+      # Get and validate the version, create and push tag
       - |
-        version=$(svu next)
-        git tag -a $version -m "Release $version"
-        git push origin $version
+        # Set version
+        if [ -n "{{.VERSION}}" ]; then
+          version="{{.VERSION}}"
+          # Validate version format (vX.Y.Z where X,Y,Z are numbers)
+          if ! echo "$version" | grep -qE "^v(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)$"; then
+            echo "Error: Version must be in format vX.Y.Z where X,Y,Z are numbers (e.g. v1.2.3)"
+            exit 1
+          fi
+          echo "Using specified version: $version"
+        else
+          version=$(svu next)
+          echo "Next version will be $version"
+        fi
 
-      # Instructions for monitoring
-      - echo "Release process started!"
-      - echo "Monitor the release at https://github.com/scalvert/glean-cli/actions"
+        # Confirm before proceeding
+        echo "Press Ctrl+C to cancel or wait 5 seconds to continue..."
+        sleep 5
+
+        # Handle existing tag if force is true
+        if [ "{{.FORCE}}" = "true" ]; then
+          if git rev-parse "$version" >/dev/null 2>&1; then
+            echo "Force flag set. Removing existing tag $version"
+            git tag -d "$version"
+            git push origin ":refs/tags/$version"
+          fi
+        fi
+
+        # Create and push the tag
+        if [ "{{.FORCE}}" = "true" ]; then
+          git tag -f -a "$version" -m "Release $version"
+        else
+          git tag -a "$version" -m "Release $version"
+        fi
+        git push origin "$version" --force
+
+        # Instructions for monitoring
+        echo "Release process started!"
+        echo "Monitor the release at https://github.com/scalvert/glean-cli/actions"
     preconditions:
       - sh: "git diff-index --quiet HEAD"
         msg: "Working directory is not clean. Please commit or stash changes first."