Rename release validation scripts

Author: danielsaidi

README.md

@@ -27,9 +27,10 @@ The `scripts` folder contains the following scripts:
 * `git_default_branch.sh` - Get the default git branch name.
 * `package_name.sh` - Get the name of the main Swift package.
 * `release.sh` - Make a release build with several validation steps.
-* `release_validate.sh` - Validate the current branch for release.
 * `sync_from.sh` - Sync `scripts` from a Swift Package Scripts folder.
 * `test.sh` - Test a target on all or some platforms.
+* `validate_git_branch.sh` - Validate the current branch.
+* `validate_release.sh` - Validate the package for release.
 * `version_bump.sh` - Bump the current version number and create a new tag.
 * `version_number.sh` - Get the current version number from the latest tag.
 

Sources/SwiftPackageScripts/Documentation.docc/SwiftPackageScripts.md

@@ -18,9 +18,10 @@ The `scripts` folder contains the following scripts:
 * `git_default_branch.sh` - Get the default git branch name.
 * `package_name.sh` - Get the name of the main Swift package.
 * `release.sh` - Make a release build with several validation steps.
-* `release_validate.sh` - Validate the current branch for release.
 * `sync_from.sh` - Sync `scripts` from a Swift Package Scripts folder.
 * `test.sh` - Test a target on all or some platforms.
+* `validate_git_branch.sh` - Validate the current branch.
+* `validate_release.sh` - Validate the package for release.
 * `version_bump.sh` - Bump the current version number and create a new tag.
 * `version_number.sh` - Get the current version number from the latest tag.
 

scripts/release.sh

@@ -16,7 +16,7 @@ show_usage() {
 
     echo
     echo "This script will:"
-    echo "  * Call release_validate.sh to run tests, swiftlint, git validation, etc."
+    echo "  * Call validate_release.sh to run tests, swiftlint, git validation, etc."
     echo "  * Call version_bump.sh if all validation steps above passed"
 
     echo
@@ -130,7 +130,7 @@ fi
 
 # Use the script folder to refer to other scripts
 FOLDER="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
-SCRIPT_VALIDATE="$FOLDER/release_validate.sh"
+SCRIPT_VALIDATE="$FOLDER/validate_release.sh"
 SCRIPT_VERSION_BUMP="$FOLDER/version_bump.sh"
 
 # A function that runs a certain script and checks for errors
@@ -163,4 +163,4 @@ run_script "$SCRIPT_VERSION_BUMP"
 # Complete successfully
 echo
 echo "Release created successfully!"
-echo
+echo

scripts/release_validate_git.sh scripts/validate_git_branch.shscripts/release_validate_git.sh renamed to scripts/validate_git_branch.sh

@@ -9,8 +9,9 @@ show_usage() {
     echo "This script validates the Git repository for release."
 
     echo
-    echo "Usage: $0 [BRANCH]"
+    echo "Usage: $0 [BRANCH] [-b|--branch <BRANCH>]"
     echo "  [BRANCH]              Optional. The branch to validate (auto-detects main/master if not specified)"
+    echo "  -b, --branch          Optional. The branch to validate"
 
     echo
     echo "This script will:"
@@ -23,6 +24,8 @@ show_usage() {
     echo "  $0"
     echo "  $0 master"
     echo "  $0 develop"
+    echo "  $0 -b main"
+    echo "  $0 --branch develop"
     echo
 }
 
@@ -50,6 +53,14 @@ BRANCH=""  # Will be set to default after parsing
 # Parse command line arguments
 while [[ $# -gt 0 ]]; do
     case $1 in
+        -b|--branch)
+            shift  # Remove --branch from arguments
+            if [[ $# -eq 0 || "$1" =~ ^- ]]; then
+                show_usage_error_and_exit "--branch requires a branch name"
+            fi
+            BRANCH="$1"
+            shift
+            ;;
         -h|--help)
             show_usage; exit 0 ;;
         -*)
@@ -103,4 +114,4 @@ fi
 # Complete successfully
 echo
 echo "Git repository validated successfully!"
-echo
+echo

scripts/release_validate.sh scripts/validate_release.shscripts/release_validate.sh renamed to scripts/validate_release.sh

@@ -6,7 +6,7 @@ set -e
 # Function to display usage information
 show_usage() {
     echo
-    echo "This script validates a <TARGET> for release."
+    echo "This script validates a <TARGET> for release by checking the git repo, then running lint and unit tests for all platforms."
 
     echo
     echo "Usage: $0 [TARGET] [-p|--platforms <PLATFORM1> <PLATFORM2> ...]"
@@ -113,7 +113,7 @@ fi
 
 # Use the script folder to refer to other scripts
 FOLDER="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
-SCRIPT_VALIDATE_GIT="$FOLDER/release_validate_git.sh"
+SCRIPT_VALIDATE_GIT="$FOLDER/validate_git_branch.sh"
 SCRIPT_TEST="$FOLDER/test.sh"
 
 # A function that runs a certain script and checks for errors
@@ -153,4 +153,4 @@ run_script "$SCRIPT_TEST" "$TARGET" -p $PLATFORMS
 # Complete successfully
 echo
 echo "Project successfully validated!"
-echo
+echo