Merge pull request #266 from PratikforCoding/go-version-update

Updated go version to 1.19 in make file of jx-admin

.github/workflows/jenkins-x-release.yaml

@@ -37,12 +37,13 @@ jobs:
         entrypoint: /bin/ash
     - env:
         GITHUB_TOKEN: ${{ secrets.GIT_BOT_TOKEN }}
-        REPO_NAME: ${{ github.event.repository.name }}
+        REPOSITORY: ${{ github.repository }}
         VERSION: ${{ steps.prep.outputs.version }}
-      name: changelog
-      uses: docker://ghcr.io/jenkins-x/jx-changelog:0.0.43
+        COSIGN_EXPERIMENTAL: "true"
+      name: upload-binaries
+      uses: docker://ghcr.io/jenkins-x/jx-goreleaser-image:0.1.0@sha256:4ac5aeb4ce850761aeffc585446ea47bbcfa680d096fdd8c5d00c5a8c5adbcc0
       with:
-        entrypoint: .github/workflows/jenkins-x/changelog.sh
+        entrypoint: .github/workflows/jenkins-x/upload-binaries.sh
     - env:
         GITHUB_TOKEN: ${{ secrets.GIT_BOT_TOKEN }}
         REPOSITORY: ${{ github.repository }}

.github/workflows/jenkins-x/upload-binaries.sh

@@ -1,8 +1,5 @@
 #!/bin/bash
 
-echo "HOME is $HOME"
-echo current git configuration
-
 # See https://github.com/actions/checkout/issues/766
 git config --global --add safe.directory "$GITHUB_WORKSPACE"
 git config --global --get user.name
@@ -13,20 +10,10 @@ echo "setting git user"
 git config --global user.name jenkins-x-bot-test
 git config --global user.email "[email protected]"
 
-git add * || true
-git commit -a -m "chore: release $VERSION" --allow-empty
-git tag -fa v$VERSION -m "Release version $VERSION"
-git push origin v$VERSION
-
 export BRANCH=$(git rev-parse --abbrev-ref HEAD)
 export BUILDDATE=$(date)
 export REV=$(git rev-parse HEAD)
-export GOVERSION="1.17.9"
+export GOVERSION="$(go version | sed -e 's/^[^0-9.]*\([0-9.]*\).*/\1/')"
 export ROOTPACKAGE="github.com/$REPOSITORY"
 
-# Install syft in this script
-curl -sSfL https://raw.githubusercontent.com/anchore/syft/main/install.sh | \
-sh -s -- -b /usr/local/bin v0.54.0
-chmod +x /usr/local/bin/syft
-
 goreleaser release

Makefile

@@ -13,7 +13,7 @@ ORG := jenkins-x-plugins
 ORG_REPO := $(ORG)/$(NAME)
 RELEASE_ORG_REPO := $(ORG_REPO)
 ROOT_PACKAGE := github.com/$(ORG_REPO)
-GO_VERSION := 1.17.9
+GO_VERSION := $(shell $(GO) version | sed -e 's/^[^0-9.]*\([0-9.]*\).*/\1/')
 GO_DEPENDENCIES := $(call rwildcard,pkg/,*.go) $(call rwildcard,cmd/,*.go)
 
 BRANCH     := $(shell git rev-parse --abbrev-ref HEAD 2> /dev/null  || echo 'unknown')
@@ -174,4 +174,4 @@ docs: bin/docs ## update docs
 	@echo "Generating docs"
 	@./bin/docs --target=./docs/cmd
 	@./bin/docs --target=./docs/man/man1 --kind=man
-	@rm -f ./bin/docs
+	@rm -f ./bin/docs

go.mod

@@ -101,4 +101,4 @@ replace (
 	k8s.io/client-go => k8s.io/client-go v0.22.15
 )
 
-go 1.18
+go 1.19