Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion .github/workflows/on-push-beta-version-tag.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@ 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
Expand All @@ -39,7 +42,9 @@ jobs:
working-directory: distributions/otelcol-mackerel
- name: Run GoReleaser
run: |
go tool goreleaser release
# 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
working-directory: distributions/otelcol-mackerel
env:
GORELEASER_CURRENT_TAG: ${{ github.ref_name }}
Expand Down
7 changes: 6 additions & 1 deletion .github/workflows/wf-test-otelcolmackerel.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@ 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
Expand All @@ -24,5 +27,7 @@ jobs:
working-directory: distributions/otelcol-mackerel
- name: Run GoReleaser
run: |
GORELEASER_CURRENT_TAG=v0.0.0 go tool goreleaser release --snapshot --clean
# 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
working-directory: distributions/otelcol-mackerel
2 changes: 1 addition & 1 deletion distributions/otelcol-mackerel/generate.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
package otelcolmackerel

//go:generate go tool builder --config=manifest.yaml --skip-compilation
//go:generate go tool -modfile=../../tool.mod builder --config=manifest.yaml --skip-compilation

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

go generate always changes current directory to the package directory it is declared, so this ../../ will always works fine.

2 changes: 1 addition & 1 deletion distributions/otelcol-test/generate.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
package otelcoltest

//go:generate go tool builder --config=manifest.yaml
//go:generate go tool -modfile=../../tool.mod builder --config=manifest.yaml
357 changes: 2 additions & 355 deletions go.mod

Large diffs are not rendered by default.

1,146 changes: 0 additions & 1,146 deletions go.sum

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions renovate.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
"extends": ["config:recommended"],
"ocb": { "managerFilePatterns": ["/^distributions/.*/manifest\\.yaml$/"] },
"gomod": { "managerFilePatterns": ["/^.*\\.mod$/"] },
"packageRules": [
{
"matchManagers": ["gomod"],
Expand Down
4 changes: 2 additions & 2 deletions scripts/push-multimod-tags.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ if [ -n "$(git status --porcelain)" ]; then
exit 1
fi

go tool multimod verify
go tool -modfile=tool.mod multimod verify

for tag in $(go tool multimod tag -c "$CURRENT_SHA" -m beta -p --print-tags)
for tag in $(go tool -modfile=tool.mod multimod tag -c "$CURRENT_SHA" -m beta -p --print-tags)
do
git push origin "$tag"
done
358 changes: 358 additions & 0 deletions tool.mod

Large diffs are not rendered by default.

1,146 changes: 1,146 additions & 0 deletions tool.sum

Large diffs are not rendered by default.