Merge branch 'main' into zimeg-ci-gobump-label

Author: zimeg

.circleci/config.yml

@@ -554,6 +554,15 @@ workflows:
           context: slack-cli-release
           release_ref: dev-build
       - e2e-test:
+          name: e2e-test-unix
+          manual_trigger_windows: false
+          requires:
+            - create-github-release-and-artifacts
+          context: slack-cli-e2e
+          release_ref: dev-build
+      - e2e-test:
+          name: e2e-test-windows
+          manual_trigger_windows: true
           requires:
             - create-github-release-and-artifacts
           context: slack-cli-e2e
@@ -580,6 +589,15 @@ workflows:
           context: slack-cli-release
           release_ref: dev-build
       - e2e-test:
+          name: e2e-test-unix
+          manual_trigger_windows: false
+          requires:
+            - create-github-release-and-artifacts
+          context: slack-cli-e2e
+          release_ref: dev-build
+      - e2e-test:
+          name: e2e-test-windows
+          manual_trigger_windows: true
           requires:
             - create-github-release-and-artifacts
           context: slack-cli-e2e
@@ -695,34 +713,3 @@ workflows:
           requires:
             - create-github-release-and-artifacts
           context: slack-cli-release
-
-  # production tests are run separate from deployment to avoid errors with tags.
-  prod-build-test-e2e-test:
-    when:
-      matches:
-        pattern: "^v(\\d+\\.)?(\\d+\\.)?(\\d+)$"
-        value: << pipeline.git.tag >>
-    jobs:
-      - build:
-          <<: *filters-tag-triggered-workflow-job
-          context: slack-cli-release
-          release_ref: << pipeline.git.tag >>
-      - create-github-release-and-artifacts:
-          requires:
-            - build
-          context: slack-cli-release
-          release_ref: << pipeline.git.branch >>
-      - e2e-test:
-          name: e2e-test-unix
-          e2e_target_branch: "main"
-          manual_trigger_windows: false
-          requires:
-            - create-github-release-and-artifacts
-          context: slack-cli-e2e
-      - e2e-test:
-          name: e2e-test-windows
-          e2e_target_branch: "main"
-          manual_trigger_windows: true
-          requires:
-            - create-github-release-and-artifacts
-          context: slack-cli-e2e

.github/workflows/tests.yml

@@ -27,7 +27,7 @@ jobs:
         with:
           go-version: "1.25.3"
       - name: Lint
-        uses: golangci/golangci-lint-action@4afd733a84b1f43292c63897423277bb7f4313a9 # v8.0.0
+        uses: golangci/golangci-lint-action@0a35821d5c230e903fcfe077583637dea1b27b47 # v9.0.0
         with:
           version: latest
           args: --timeout=5m

go.mod

@@ -24,7 +24,7 @@ require (
 	github.com/stretchr/testify v1.11.1
 	github.com/uber/jaeger-client-go v2.30.0+incompatible
 	golang.org/x/mod v0.29.0
-	golang.org/x/sys v0.37.0
+	golang.org/x/sys v0.38.0
 	golang.org/x/text v0.30.0
 	gopkg.in/yaml.v2 v2.4.0
 )

go.sum

@@ -205,8 +205,8 @@ golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.37.0 h1:fdNQudmxPjkdUTPnLn5mdQv7Zwvbvpaxqs831goi9kQ=
-golang.org/x/sys v0.37.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
+golang.org/x/sys v0.38.0 h1:3yZWxaJjBmCWXqhN1qh02AkOnCQ1poK6oF+a7xWL6Gc=
+golang.org/x/sys v0.38.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/term v0.36.0 h1:zMPR+aF8gfksFprF/Nc/rd1wRS1EI6nDBGyWAvDzx2Q=