Skip to content

Commit c20badd

Browse files
rafaelroquettorafaelroquetto
committed
debug
1 parent d70346e commit c20badd

File tree

4 files changed

+101
-97
lines changed

4 files changed

+101
-97
lines changed

‎.github/workflows/build.yml

Lines changed: 93 additions & 92 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ jobs:
1515
strategy:
1616
matrix:
1717
os: [linux]
18-
arch: [amd64, arm64, ppc64le, s390x]
18+
#arch: [amd64, arm64, ppc64le, s390x]
19+
arch: [amd64]
1920
steps:
2021
- name: Checkout code
2122
uses: actions/checkout@v4
@@ -33,96 +34,96 @@ jobs:
3334
- run: make generate-ui
3435
- run: GO_TAGS="builtinassets promtail_journal_enabled" GOOS=${{ matrix.os }} GOARCH=${{ matrix.arch }} GOARM= make alloy
3536

36-
build_linux_boringcrypto:
37-
name: Build on Linux (boringcrypto)
38-
runs-on: ubuntu-latest
39-
container: grafana/alloy-build-image:v0.1.8-boringcrypto
40-
strategy:
41-
matrix:
42-
os: [linux]
43-
arch: [amd64, arm64]
44-
steps:
45-
- name: Checkout code
46-
uses: actions/checkout@v4
47-
- name: Set ownership
48-
# https://github.com/actions/runner/issues/2033#issuecomment-1204205989
49-
run: |
50-
# this is to fix GIT not liking owner of the checkout dir
51-
chown -R $(id -u):$(id -g) $PWD
52-
- name: Set up Go
53-
uses: actions/setup-go@v5
54-
with:
55-
go-version-file: go.mod
56-
# TODO: Try enabling caching later. It might use up too much disk space on runners so needs extra testing.
57-
cache: false
58-
- run: make generate-ui
59-
- run: GO_TAGS="builtinassets promtail_journal_enabled" GOOS=${{ matrix.os }} GOARCH=${{ matrix.arch }} GOARM= GOEXPERIMENT=boringcrypto make alloy
60-
61-
build_mac_intel:
62-
name: Build on MacOS (Intel)
63-
runs-on: macos-14-large
64-
steps:
65-
- name: Checkout code
66-
uses: actions/checkout@v4
67-
- name: Set up Go
68-
uses: actions/setup-go@v5
69-
with:
70-
go-version-file: go.mod
71-
# TODO: Try enabling caching later. It might use up too much disk space on runners so needs extra testing.
72-
cache: false
73-
- run: make generate-ui
74-
- run: GO_TAGS="builtinassets" GOOS=darwin GOARCH=amd64 GOARM= make alloy
75-
76-
build_mac_arm:
77-
name: Build on MacOS (ARM)
78-
runs-on: macos-14-xlarge
79-
steps:
80-
- name: Checkout code
81-
uses: actions/checkout@v4
82-
- name: Set up Go
83-
uses: actions/setup-go@v5
84-
with:
85-
go-version-file: go.mod
86-
# TODO: Try enabling caching later. It might use up too much disk space on runners so needs extra testing.
87-
cache: false
88-
- run: make generate-ui
89-
- run: GO_TAGS="builtinassets" GOOS=darwin GOARCH=arm64 GOARM= make alloy
37+
# build_linux_boringcrypto:
38+
# name: Build on Linux (boringcrypto)
39+
# runs-on: ubuntu-latest
40+
# container: grafana/alloy-build-image:v0.1.8-boringcrypto
41+
# strategy:
42+
# matrix:
43+
# os: [linux]
44+
# arch: [amd64, arm64]
45+
# steps:
46+
# - name: Checkout code
47+
# uses: actions/checkout@v4
48+
# - name: Set ownership
49+
# # https://github.com/actions/runner/issues/2033#issuecomment-1204205989
50+
# run: |
51+
# # this is to fix GIT not liking owner of the checkout dir
52+
# chown -R $(id -u):$(id -g) $PWD
53+
# - name: Set up Go
54+
# uses: actions/setup-go@v5
55+
# with:
56+
# go-version-file: go.mod
57+
# # TODO: Try enabling caching later. It might use up too much disk space on runners so needs extra testing.
58+
# cache: false
59+
# - run: make generate-ui
60+
# - run: GO_TAGS="builtinassets promtail_journal_enabled" GOOS=${{ matrix.os }} GOARCH=${{ matrix.arch }} GOARM= GOEXPERIMENT=boringcrypto make alloy
61+
#
62+
#build_mac_intel:
63+
# name: Build on MacOS (Intel)
64+
# runs-on: macos-14-large
65+
# steps:
66+
# - name: Checkout code
67+
# uses: actions/checkout@v4
68+
# - name: Set up Go
69+
# uses: actions/setup-go@v5
70+
# with:
71+
# go-version-file: go.mod
72+
# # TODO: Try enabling caching later. It might use up too much disk space on runners so needs extra testing.
73+
# cache: false
74+
# - run: make generate-ui
75+
# - run: GO_TAGS="builtinassets" GOOS=darwin GOARCH=amd64 GOARM= make alloy
76+
#
77+
#build_mac_arm:
78+
# name: Build on MacOS (ARM)
79+
# runs-on: macos-14-xlarge
80+
# steps:
81+
# - name: Checkout code
82+
# uses: actions/checkout@v4
83+
# - name: Set up Go
84+
# uses: actions/setup-go@v5
85+
# with:
86+
# go-version-file: go.mod
87+
# # TODO: Try enabling caching later. It might use up too much disk space on runners so needs extra testing.
88+
# cache: false
89+
# - run: make generate-ui
90+
# - run: GO_TAGS="builtinassets" GOOS=darwin GOARCH=arm64 GOARM= make alloy
9091

91-
build_windows:
92-
name: Build on Windows (AMD64)
93-
runs-on: windows-latest
94-
steps:
95-
- name: Checkout code
96-
uses: actions/checkout@v4
97-
- name: Set up Go
98-
uses: actions/setup-go@v5
99-
with:
100-
go-version-file: go.mod
101-
# TODO: Try enabling caching later. It might use up too much disk space on runners so needs extra testing.
102-
cache: false
103-
- run: make generate-ui
104-
- run: echo "GO_TAGS=builtinassets" | Out-File -FilePath $env:GITHUB_ENV -Append
105-
- run: echo "GOOS=windows" | Out-File -FilePath $env:GITHUB_ENV -Append
106-
- run: echo "GOARCH=amd64" | Out-File -FilePath $env:GITHUB_ENV -Append
107-
- run: make alloy
92+
#build_windows:
93+
# name: Build on Windows (AMD64)
94+
# runs-on: windows-latest
95+
# steps:
96+
# - name: Checkout code
97+
# uses: actions/checkout@v4
98+
# - name: Set up Go
99+
# uses: actions/setup-go@v5
100+
# with:
101+
# go-version-file: go.mod
102+
# # TODO: Try enabling caching later. It might use up too much disk space on runners so needs extra testing.
103+
# cache: false
104+
# - run: make generate-ui
105+
# - run: echo "GO_TAGS=builtinassets" | Out-File -FilePath $env:GITHUB_ENV -Append
106+
# - run: echo "GOOS=windows" | Out-File -FilePath $env:GITHUB_ENV -Append
107+
# - run: echo "GOARCH=amd64" | Out-File -FilePath $env:GITHUB_ENV -Append
108+
# - run: make alloy
108109

109-
build_freebsd:
110-
name: Build on FreeBSD (AMD64)
111-
runs-on: ubuntu-latest
112-
container: grafana/alloy-build-image:v0.1.8
113-
steps:
114-
- name: Checkout code
115-
uses: actions/checkout@v4
116-
- name: Set ownership
117-
# https://github.com/actions/runner/issues/2033#issuecomment-1204205989
118-
run: |
119-
# this is to fix GIT not liking owner of the checkout dir
120-
chown -R $(id -u):$(id -g) $PWD
121-
- name: Set up Go
122-
uses: actions/setup-go@v5
123-
with:
124-
go-version-file: go.mod
125-
# TODO: Try enabling caching later. It might use up too much disk space on runners so needs extra testing.
126-
cache: false
127-
- run: make generate-ui
128-
- run: GO_TAGS="builtinassets" GOOS=freebsd GOARCH=amd64 GOARM= make alloy
110+
#build_freebsd:
111+
# name: Build on FreeBSD (AMD64)
112+
# runs-on: ubuntu-latest
113+
# container: grafana/alloy-build-image:v0.1.8
114+
# steps:
115+
# - name: Checkout code
116+
# uses: actions/checkout@v4
117+
# - name: Set ownership
118+
# # https://github.com/actions/runner/issues/2033#issuecomment-1204205989
119+
# run: |
120+
# # this is to fix GIT not liking owner of the checkout dir
121+
# chown -R $(id -u):$(id -g) $PWD
122+
# - name: Set up Go
123+
# uses: actions/setup-go@v5
124+
# with:
125+
# go-version-file: go.mod
126+
# # TODO: Try enabling caching later. It might use up too much disk space on runners so needs extra testing.
127+
# cache: false
128+
# - run: make generate-ui
129+
# - run: GO_TAGS="builtinassets" GOOS=freebsd GOARCH=amd64 GOARM= make alloy

‎Makefile

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -280,8 +280,11 @@ drone: generate-drone
280280
# Alloy binary
281281
.PHONY: generate-beyla
282282
generate-beyla:
283-
@go mod vendor
284-
@GOOS=$(GOHOSTOS) GOARCH=$(GOHOSTARCH) go generate vendor/github.com/grafana/beyla/v2/bpf/build_ebpf.go > /dev/null
283+
echo current dir is
284+
pwd
285+
ls -ld `pwd`
286+
go mod vendor
287+
GOOS=$(GOHOSTOS) GOARCH=$(GOHOSTARCH) go generate vendor/github.com/grafana/beyla/v2/bpf/build_ebpf.go
285288

286289
.PHONY: clean
287290
clean: clean-dist clean-build-container-cache

‎go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -893,7 +893,7 @@ require (
893893
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
894894
)
895895

896-
require github.com/grafana/beyla/v2 v2.0.1-0.20250220141223-3107a3218705
896+
require github.com/grafana/beyla/v2 v2.0.1-0.20250220180606-8a2fd0c82101
897897

898898
// NOTE: replace directives below must always be *temporary*.
899899
//

‎go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1248,8 +1248,8 @@ github.com/gosnmp/gosnmp v1.38.0/go.mod h1:FE+PEZvKrFz9afP9ii1W3cprXuVZ17ypCcyyf
12481248
github.com/gotestyourself/gotestyourself v2.2.0+incompatible/go.mod h1:zZKM6oeNM8k+FRljX1mnzVYeS8wiGgQyvST1/GafPbY=
12491249
github.com/grafana/alloy-remote-config v0.0.10 h1:1Ge7lz2mjXI1rd6SmiZpFHyXeLehBuCi43+XTkdqgV4=
12501250
github.com/grafana/alloy-remote-config v0.0.10/go.mod h1:kHE1usYo2WAVCikQkIXuoG1Clz8BSdiz3kF+DZSCQ4k=
1251-
github.com/grafana/beyla/v2 v2.0.1-0.20250220141223-3107a3218705 h1:hRKODZCnUXYG2/m9pdzKWtEZgzDhAXNaJ6Nhr8MwwJg=
1252-
github.com/grafana/beyla/v2 v2.0.1-0.20250220141223-3107a3218705/go.mod h1:MKNkPychrqv6FKK6yI3i3Eqn4QNBGJY9hZGeO7Su+ck=
1251+
github.com/grafana/beyla/v2 v2.0.1-0.20250220180606-8a2fd0c82101 h1:lN7fi17kAM8sApNlOGG/KO5M8egjTXUtWqmcdFCGQwk=
1252+
github.com/grafana/beyla/v2 v2.0.1-0.20250220180606-8a2fd0c82101/go.mod h1:MKNkPychrqv6FKK6yI3i3Eqn4QNBGJY9hZGeO7Su+ck=
12531253
github.com/grafana/cadvisor v0.0.0-20240729082359-1f04a91701e2 h1:ju6EcY2aEobeBg185ETtFCKj5WzaQ48qfkbsSRRQrF4=
12541254
github.com/grafana/cadvisor v0.0.0-20240729082359-1f04a91701e2/go.mod h1:8sLW/G7rcFe1CKMaA4pYT4mX3P1xQVGqM6luzEzx/2g=
12551255
github.com/grafana/catchpoint-prometheus-exporter v0.0.0-20250218151502-6e97feaee761 h1:dPJOIEwtQ8uR3Qa79pb/lsSFJQ6j4P9vpCUQ4fKimG4=

0 commit comments

Comments
 (0)