fixed lint on main + use env VERSION for docker image versioning (#7)

Signed-off-by: pco <pasquale.convertini@ibm.com>

Author: pasquale95

.github/workflows/build-image.yml

@@ -30,6 +30,8 @@ jobs:
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
+      - name: Extract version from tag
+        run: echo "VERSION=${GITHUB_REF#refs/tags/v}" >> $GITHUB_ENV
       - name: Build and Push Multi-Platform Docker Image
         uses: docker/build-push-action@v6
         with:
@@ -38,7 +40,7 @@ jobs:
           platforms: linux/amd64,linux/arm64,linux/s390x
           push: true
           build-args: |
-            FABRIC_X_VERSION=${GITHUB_REF#refs/tags/v}
+            FABRIC_X_VERSION=${{ env.VERSION }}
           tags: |
-            docker.io/hyperledger/fabric-x-tools:${GITHUB_REF#refs/tags/v}
+            docker.io/hyperledger/fabric-x-tools:${{ env.VERSION }}
             docker.io/hyperledger/fabric-x-tools:latest

.github/workflows/lint.yml

@@ -28,5 +28,5 @@ jobs:
           go install github.com/golangci/golangci-lint/v2/cmd/golangci-lint@latest
       - name: Run lint
         run: |
-          git fetch origin main:main
+          git fetch origin main:refs/remotes/origin/main
           make lint

Makefile

@@ -62,11 +62,11 @@ clean: ## Cleans the build area
 	-@rm -rf $(BUILD_DIR)
 
 # Run lint
-# TODO: fix existing lint issues (to find them, remove --new-from-rev=main option)
+# TODO: fix existing lint issues (to find them, remove --new-from-rev=origin/main option)
 .PHONY: lint
 lint: FORCE
 	@echo "Running Go Linters..."
-	cd tools && golangci-lint run --new-from-rev=main --color=always --max-same-issues 0
+	cd tools && golangci-lint run --new-from-rev=origin/main --color=always --max-same-issues 0
 	@echo "Running License Header Linters..."
 	scripts/license-lint.sh