Revert "Merge pull request #74 separate tool directives in go.mod to tool.mod"

.github/workflows/on-push-beta-version-tag.yml

@@ -14,9 +14,6 @@ jobs:
       - uses: actions/setup-go@4dc6199c7b1a012772edbd06daecab0f50c9053c # v6.1.0
         with:
           go-version-file: go.mod
-          cache-dependency-path: |
-            go.sum
-            tool.sum
       - uses: docker/setup-qemu-action@c7c53464625b32c7a7e944ae62b3e17d2b600130 # v3.7.0
       - uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # v3.11.1
       - name: Login to Docker Hub
@@ -42,9 +39,7 @@ jobs:
         working-directory: distributions/otelcol-mackerel
       - name: Run GoReleaser
         run: |
-          # goreleaser itself will run on go directive declared in tool.mod
-          # but the artifact, it's otelcol-mackerel here, will build on go version that was setup via setup-go above
-          go tool -modfile=../../tool.mod goreleaser release
+          go tool goreleaser release
         working-directory: distributions/otelcol-mackerel
         env:
           GORELEASER_CURRENT_TAG: ${{ github.ref_name }}

.github/workflows/wf-test-otelcolmackerel.yml

@@ -16,9 +16,6 @@ jobs:
         with:
           go-version-file: go.mod
           cache: ${{ inputs.go-cache }}
-          cache-dependency-path: |
-            go.sum
-            tool.sum
       - uses: docker/setup-qemu-action@c7c53464625b32c7a7e944ae62b3e17d2b600130 # v3.7.0
       - uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # v3.11.1
       - name: Run OpenTelemetry Collector Builder
@@ -27,7 +24,5 @@ jobs:
         working-directory: distributions/otelcol-mackerel
       - name: Run GoReleaser
         run: |
-          # goreleaser itself will run on go directive declared in tool.mod
-          # but the artifact, it's otelcol-mackerel here, will build on go version that was setup via setup-go above
-          GORELEASER_CURRENT_TAG=v0.0.0 go tool -modfile=../../tool.mod goreleaser release --snapshot --clean
+          GORELEASER_CURRENT_TAG=v0.0.0 go tool goreleaser release --snapshot --clean
         working-directory: distributions/otelcol-mackerel

distributions/otelcol-mackerel/generate.go

@@ -1,3 +1,3 @@
 package otelcolmackerel
 
-//go:generate go tool -modfile=../../tool.mod builder --config=manifest.yaml --skip-compilation
+//go:generate go tool builder --config=manifest.yaml --skip-compilation

distributions/otelcol-test/generate.go

@@ -1,3 +1,3 @@
 package otelcoltest
 
-//go:generate go tool -modfile=../../tool.mod builder --config=manifest.yaml
+//go:generate go tool builder --config=manifest.yaml

renovate.json

@@ -2,7 +2,6 @@
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
   "extends": ["config:recommended"],
   "ocb": { "managerFilePatterns": ["/^distributions/.*/manifest\\.yaml$/"] },
-  "gomod": { "managerFilePatterns": ["/^.*\\.mod$/"] },
   "packageRules": [
     {
       "matchManagers": ["gomod"],

scripts/push-multimod-tags.sh

@@ -15,9 +15,9 @@ if [ -n "$(git status --porcelain)" ]; then
   exit 1
 fi
 
-go tool -modfile=tool.mod multimod verify
+go tool multimod verify
 
-for tag in $(go tool -modfile=tool.mod multimod tag -c "$CURRENT_SHA" -m beta -p --print-tags)
+for tag in $(go tool multimod tag -c "$CURRENT_SHA" -m beta -p --print-tags)
 do
   git push origin "$tag"
 done