adjusting version fix

Reviewed-on: #2

.gitea/workflows/test.yaml

@@ -1,14 +1,10 @@
 name: "test"
 run-name: "test"
-on: 
+on: push
-  push:
-    tags:
-      - "v*"
-      - "!v*-beta*"
 
 jobs:
   test:
-    runs-on: [smoketest]
+    runs-on: action
     steps:
       - uses: actions/checkout@v4
 
@@ -20,10 +16,11 @@ jobs:
       - name: "run go install script"
         shell: bash
         env:
-          GO_INSTALL_COMMANDS: github.com/jake-young-dev/kelp@v0.0.9
+          GO_INSTALL_COMMANDS: code.jakeyoungdev.com/jake/mctl@v0.3.4
+          GO_INSTALL_ARCH: amd64
         run: |
           chmod +x install.sh
-          ./install.sh amd64 no
+          ./install.sh
 
       - name: "check go version"
         shell: bash
@@ -31,4 +28,19 @@ jobs:
 
       - name: "check go installed command"
         shell: bash
-        run: kelp -v | grep "kelp version v0.0.9"
+        run: mctl -v | grep "mctl version v0.3.4"
+
+      - name: "remove go"
+        shell: bash
+        env:
+          GO_INSTALL_COMMANDS: code.jakeyoungdev.com/jake/mctl@v0.3.4
+          GO_INSTALL_PURGE: yes
+          GO_INSTALL_VERSION: 1.23.2
+          GO_INSTALL_ARCH: amd64
+        run: |
+          rm go.mod
+          ./install.sh
+
+      - name: "check go version"
+        shell: bash
+        run: go version | grep "go version go1.23.2 linux/amd64"

README.md

@@ -1,4 +1,5 @@
 # install-go
+![tests](https://code.jakeyoungdev.com/actions/install-go/actions/workflows/test.yaml/badge.svg?branch=main&event=push) <br />
 An extremely simple github action to install golang and golang commands (using "go install") on linux hosts. This provides the ability to install and setup golang without node/typescript which is required when using [actions/setup-go](https://github.com/actions/setup-go). 
 
 
@@ -9,19 +10,20 @@ Use a tagged release to avoid unexpected changes that may come to the master bra
     uses: https://code.jakeyoungdev.com/actions/install-go@master
     with:
         commands: |
-            github.com/jake-young-dev/kelp@v0.0.9
+            code.jakeyoungdev.com/jake/mctl@v0.3.3
 ```
 
 #### Go verions
-Go version is determined using the go.mod file in the root of working directory. Go files are pulled directly from the go download [site](https://go.dev/dl/) and all go commands are installed using 'go install' after setup. If a Go version is already present the 'purge' input must be set to 'yes' to avoid errors.
+The Go version installed is determined by the version specified in the go.mod file. If not mod file is present the 'version' input is used. Go files are pulled directly from the Go download [site](https://go.dev/dl/) and all go commands are installed using 'go install' after setup. If a different version of Go is already installed the 'purge' input must be set to 'yes' to remove it and avoid errors.
+
 #### Inputs
 Some inputs are available to customize the installation
 |Input|Required|Values|Default|Description|
 |---|---|---|---|---|
-|arch|no|any arch for Go|amd64|system architecture for golang
+|arch|no|any arch for Go|amd64|system architecture for go
-|purge|no|yes/no|no|remove any golang files found on system before install
+|purge|no|yes/no|no|remove any go files found on system before install
 |commands|no|any public go repositories|.|links to any commands to be installed using 'go install'
-
+|version|no|any go version|.|the go version to use if no mod file is present
 
 ## Issues
 This repo is a as brain-dead as I could make it and is intended to be as fast and low-level as possible. Please open an issue for any problems or suggestions.

TODO.txt

@@ -1,3 +0,0 @@
-Comments are left in code using TODO# to track possible implementation location.
-
-TODO1. check current installed version to see if it matches requested install version, only error if they don't match

action.yaml

@@ -13,6 +13,10 @@ inputs:
     description: "Optional, any commands to be installed with 'go install', must include version"
     required: false
     default: "."
+  version:
+    description: "Optional, the Go version to install if no go.mod file is present"
+    required: false
+    default: "."
 runs:
   using: composite
   steps:
@@ -23,3 +27,4 @@ runs:
         GO_INSTALL_COMMANDS: ${{ inputs.commands }}
         GO_INSTALL_ARCH: ${{ inputs.arch }}
         GO_INSTALL_PURGE: ${{ inputs.purge }}
+        GO_INSTALL_VERSION: ${{ inputs.version }}

install.sh

@@ -1,19 +1,24 @@
 #!/bin/bash
 
-echo "Starting Golang install"
+#installs any commands set in the command input value
-
+function installCommands {
-#validate version and architecture
+  #if commands input is set pull the input and install them all using 'go install'
-echo "Parsing go version"
+  if [[ "$GO_INSTALL_COMMANDS" != "." ]]; then # "." is used as a default
-#looking for go version in go.mod file, only checking up to minor version ignoring patch value to allow for stable versions
+    #allows for multiple cmds using |
-# -P uses perl syntax
+    INPUT_ARR=( $GO_INSTALL_COMMANDS )
-DL_VERSION_RAW="$(grep "^go [0-9]+.[0-9]+" go.mod -P)"
+    for i in "${INPUT_ARR[@]}"; do
-if [[ -z "$DL_VERSION_RAW" ]]; then
+        echo "Installing go command from ${i}"
-  echo "FATAL: Unable to pull version from go.mod"
+        if go install ${i}; then
+          echo "Command setup for ${i}"
+        else
+          echo "FATAL: Unable to install ${i} with go"
           exit 1
         fi
-echo "Found go version: ${DL_VERSION_RAW}"
+    done
+  fi
+}
 
-DL_ARCH=$GO_INSTALL_ARCH
+function fixVersion {
   DL_VSPL=( $DL_VERSION_RAW )
   DL_VERSION="${DL_VSPL[1]}"
 
@@ -24,23 +29,64 @@ if [[ -z "$DL_VERSION_PAD_CHECK" ]]; then
     DL_VERSION="$DL_VERSION"".0"
     echo "Fixing version number to ${DL_VERSION}"
   fi
+}
+
+#start script
+echo "Starting Golang install"
+
+#validate version and architecture
+echo "Parsing go version"
+#looking for go version in go.mod file, only checking up to minor version ignoring patch value to allow for stable versions
+# -P uses perl syntax
+DL_VERSION_RAW="$(grep "^go [0-9]+.[0-9]+" go.mod -P)"
+if [[ -z "$DL_VERSION_RAW" ]]; then
+  #no go.mod file found
+  DL_VERSION_RAW=$GO_INSTALL_VERSION
+  #no version input set either
+  if [[ "$DL_VERSION_RAW" == "." ]]; then
+    echo "FATAL: No Go version found, set version input if no go.mod file is present"
+    exit 1
+  fi
+else
+  fixVersion
+fi
+echo "Found go version: ${DL_VERSION_RAW}"
+
+DL_ARCH=$GO_INSTALL_ARCH
+# DL_VSPL=( $DL_VERSION_RAW )
+# DL_VERSION="${DL_VSPL[1]}"
+
+# #ensure we have patch-level version, if not add 0 for stable releases
+# # -P uses perl syntax
+# DL_VERSION_PAD_CHECK="$(grep "^go [0-9]+.[0-9]+.[0-9]+" go.mod -P)"
+# if [[ -z "$DL_VERSION_PAD_CHECK" ]]; then
+#   DL_VERSION="$DL_VERSION"".0"
+#   echo "Fixing version number to ${DL_VERSION}"
+# fi
 
 echo "Checking if go is already installed"
 #check if go is already present before starting install process and delete files if purge input is set
 # -v writes string that indicates command or command path to output, prevents command not found error
 GO_CHECK=$(command -v go)
 if [[ "$GO_CHECK" ]]; then
-  #if purge flag is set remove old go files
+  #if the version of go matches the requested version, skip
-  if [[ "$GO_INSTALL_PURGE" == "yes" ]]; then
+  GVC=$(go version)
+  if [[ "$GVC" == "go version go${DL_VERSION} linux/${DL_ARCH}" ]]; then
+    echo "Go ${DL_VERSION} already installed, skipping!"
+    installCommands
+    exit 0
+  fi
+  #if the purge flag is not set and version does not match, exit
+  if [[ "$GO_INSTALL_PURGE" != "yes" ]]; then
+    echo "FATAL: The wrong version of Go is already installed, set purge to 'yes' if you wish to update installed version"
+    exit 1
+  else
     echo "Removing old go versions"
     sudo rm -r /usr/bin/go 
     sudo rm -r /usr/bin/gofmt
-  else
-    #TODO1: if installed version matches requested version we can consider the job successful
-    echo "FATAL: Go is already installed, set purge to 'yes' if you wish to update installed version"
-    exit 1
   fi
 fi
+
 echo "Ready for install"
 
 echo "Downloading go files for ${DL_VERSION}/${DL_ARCH}"
@@ -82,17 +128,4 @@ GP=$(go env GOPATH)/bin
 export PATH=$PATH:$GP
 echo "$GP" >> "$GITHUB_PATH"
 
-#if commands input is set pull the input and install them all using 'go install'
+installCommands
-if [[ "$GO_INSTALL_COMMANDS" != "." ]]; then # "." is used as a default
-  #allows for multiple cmds using |
-  INPUT_ARR=( $GO_INSTALL_COMMANDS )
-  for i in "${INPUT_ARR[@]}"; do
-      echo "Installing go command from ${i}"
-      if go install ${i}; then
-        echo "Command setup for ${i}"
-      else
-        echo "FATAL: Unable to install ${i} with go"
-        exit 1
-      fi
-  done
-fi