Merge pull request #21 from bitrise-io/release-invocation-id-matching

feat: ACI-1655 Bump analytics and cache plugin version

Author: zsolt-marta-bitrise

bitrise.yml

@@ -65,7 +65,7 @@ workflows:
         - content: |-
             #!/bin/bash
             set -ex
-            curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s v1.55.2
+            curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s v1.58.0
             ./bin/golangci-lint run -v
     - go-test@1: {}
     - deploy-to-bitrise-io@2: {}

cmd/enableForBazel.go

@@ -25,7 +25,7 @@ If the file doesn't exist it will be created.
 If it already exists a "# [start/end] generated-by-bitrise-build-cache" block will be added to the end of the file.
 If the "# [start/end] generated-by-bitrise-build-cache" block is already present in the file then only the block's content will be modified.
 `,
-	RunE: func(cmd *cobra.Command, args []string) error {
+	RunE: func(_ *cobra.Command, _ []string) error {
 		//
 		logger := log.NewLogger()
 		logger.EnableDebugLog(isDebugLogMode)
@@ -93,7 +93,7 @@ func enableForBazelCmdFn(logger log.Logger, homeDirPath string, envProvider func
 	)
 
 	logger.Infof("(i) Writing config into ~/.bazelrc")
-	err = os.WriteFile(bazelrcPath, []byte(bazelrcContent), 0755) //nolint:gosec,gomnd
+	err = os.WriteFile(bazelrcPath, []byte(bazelrcContent), 0755) //nolint:gosec,gomnd,mnd
 	if err != nil {
 		return fmt.Errorf("write bazelrc config to %s, error: %w", bazelrcPath, err)
 	}

cmd/enableForGradle.go

@@ -31,7 +31,7 @@ The gradle.properties file will be created if it doesn't exist.
 If it already exists a "# [start/end] generated-by-bitrise-build-cache" block will be added to the end of the file.
 If the "# [start/end] generated-by-bitrise-build-cache" block is already present in the file then only the block's content will be modified.
 `,
-	RunE: func(cmd *cobra.Command, args []string) error {
+	RunE: func(_ *cobra.Command, _ []string) error {
 		//
 		logger := log.NewLogger()
 		logger.EnableDebugLog(isDebugLogMode)
@@ -80,7 +80,7 @@ func enableForGradleCmdFn(logger log.Logger, gradleHomePath string, envProvider
 
 	logger.Infof("(i) Ensure ~/.gradle and ~/.gradle/init.d directories exist")
 	gradleInitDPath := filepath.Join(gradleHomePath, "init.d")
-	err = os.MkdirAll(gradleInitDPath, 0755) //nolint:gomnd
+	err = os.MkdirAll(gradleInitDPath, 0755) //nolint:gomnd,mnd
 	if err != nil {
 		return fmt.Errorf("ensure ~/.gradle/init.d exists: %w", err)
 	}
@@ -94,7 +94,7 @@ func enableForGradleCmdFn(logger log.Logger, gradleHomePath string, envProvider
 	logger.Infof("(i) Write ~/.gradle/init.d/bitrise-build-cache-init.gradle.kts")
 	{
 		initGradlePath := filepath.Join(gradleInitDPath, "bitrise-build-cache-init.gradle.kts")
-		err = os.WriteFile(initGradlePath, []byte(initGradleContent), 0755) //nolint:gosec,gomnd
+		err = os.WriteFile(initGradlePath, []byte(initGradleContent), 0755) //nolint:gosec,gomnd,mnd
 		if err != nil {
 			return fmt.Errorf("write bitrise-build-cache-init.gradle.kts to %s, error: %w", initGradlePath, err)
 		}
@@ -116,7 +116,7 @@ func enableForGradleCmdFn(logger log.Logger, gradleHomePath string, envProvider
 			"org.gradle.caching=true",
 		)
 
-		err = os.WriteFile(gradlePropertiesPath, []byte(gradlePropertiesContent), 0755) //nolint:gosec,gomnd
+		err = os.WriteFile(gradlePropertiesPath, []byte(gradlePropertiesContent), 0755) //nolint:gosec,gomnd,mnd
 		if err != nil {
 			return fmt.Errorf("write gradle.properties to %s, error: %w", gradlePropertiesPath, err)
 		}

cmd/restoreGradleOutputData.go

@@ -18,7 +18,7 @@ var restoreGradleOutputDataCmd = &cobra.Command{ //nolint:gochecknoglobals
 This command will:
 - Restore the Gradle output data from the Bitrise key-value cache.
 `,
-	RunE: func(cmd *cobra.Command, args []string) error {
+	RunE: func(_ *cobra.Command, _ []string) error {
 		logger := log.NewLogger()
 		logger.EnableDebugLog(isDebugLogMode)
 		logger.TInfof("Restore Gradle output data from cache, for running diagnostics builds")

cmd/saveGradleOutputData.go

@@ -19,7 +19,7 @@ var saveGradleOutputDataCmd = &cobra.Command{ //nolint:gochecknoglobals
 - Collect the contents of **/build/ + .gradle/ directories.
 - Save the collected data to the Bitrise key-value cache.
 `,
-	RunE: func(cmd *cobra.Command, args []string) error {
+	RunE: func(_ *cobra.Command, _ []string) error {
 		logger := log.NewLogger()
 		logger.EnableDebugLog(isDebugLogMode)
 		logger.TInfof("Save Gradle output data to cache, for running diagnostics builds")

internal/config/gradle/gradleconfig_test.go

@@ -110,8 +110,8 @@ initscript {
         maven(url="https://jitpack.io")
     }
     dependencies {
-        classpath("io.bitrise.gradle:remote-cache:1.2.3")
-        classpath("io.bitrise.gradle:gradle-analytics:2.1.2")
+        classpath("io.bitrise.gradle:remote-cache:1.2.4")
+        classpath("io.bitrise.gradle:gradle-analytics:2.1.3")
     }
 }
 
@@ -165,8 +165,8 @@ initscript {
         maven(url="https://jitpack.io")
     }
     dependencies {
-        classpath("io.bitrise.gradle:remote-cache:1.2.3")
-        classpath("io.bitrise.gradle:gradle-analytics:2.1.2")
+        classpath("io.bitrise.gradle:remote-cache:1.2.4")
+        classpath("io.bitrise.gradle:gradle-analytics:2.1.3")
     }
 }
 
@@ -217,7 +217,7 @@ initscript {
         maven(url="https://jitpack.io")
     }
     dependencies {
-        classpath("io.bitrise.gradle:remote-cache:1.2.3")
+        classpath("io.bitrise.gradle:remote-cache:1.2.4")
     }
 }
 

internal/consts/consts.go

@@ -6,10 +6,10 @@ const (
 	EndpointURLATL1    = "grpc://atl-cache.services.bitrise.io:6666"
 
 	// Gradle Remote Build Cache related consts
-	GradleRemoteBuildCachePluginDepVersion = "1.2.3"
+	GradleRemoteBuildCachePluginDepVersion = "1.2.4"
 
 	// Gradle Analytics related consts
-	GradleAnalyticsPluginDepVersion = "2.1.2"
+	GradleAnalyticsPluginDepVersion = "2.1.3"
 	GradleAnalyticsEndpoint         = "gradle-analytics.services.bitrise.io"
 	GradleAnalyticsHTTPEndpoint     = "https://gradle-sink.services.bitrise.io"
 	GradleAnalyticsPort             = 443