Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

enabled CGO for Macos otelcol contrib #626

Open
wants to merge 18 commits into
base: main
Choose a base branch
from
Open

enabled CGO for Macos otelcol contrib #626

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
1bbfe63
Add CGO enabled opentelemetry collector contrib distro
pureklkl Aug 2, 2024
0c35104
merge main
pureklkl Aug 2, 2024
53c7646
add cgo to description
pureklkl Aug 2, 2024
2c06e53
add cgo to name
pureklkl Aug 2, 2024
b49ebaf
Merge branch 'main' into mac-cgo-distribution
pureklkl Aug 12, 2024
8510414
address comment, CGO security
pureklkl Aug 13, 2024
860d738
Merge branch 'main' into mac-cgo-distribution
pureklkl Aug 14, 2024
16ba0ae
update manifest
pureklkl Aug 14, 2024
ab08927
fix workflow
pureklkl Aug 18, 2024
51de2b5
Update .github/workflows/release-contrib-cgo.yaml, update workflow name.
pureklkl Aug 19, 2024
54ad8b5
enable cgo for darwin contrib release instead of creating a new release.
pureklkl Aug 22, 2024
effd787
Merge branch 'main' into mac-cgo-distribution
pureklkl Aug 23, 2024
3415767
fix conflict
pureklkl Aug 26, 2024
3187850
fix conflict
pureklkl Aug 26, 2024
22e8fe1
fix conflict
pureklkl Aug 26, 2024
78b0421
fix ci test.
pureklkl Sep 4, 2024
ac7338b
Merge branch 'main' into mac-cgo-distribution
pureklkl Sep 25, 2024
5f16205
Merge branch 'main' into mac-cgo-distribution
pureklkl Oct 8, 2024
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
2 changes: 1 addition & 1 deletion .github/workflows/base-ci-goreleaser.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ jobs:

- name: Setup Docker Buildx
if: ${{ runner.os != 'macOS' }} # docker is not available on macos
uses: docker/setup-buildx-action@aa33708b10e362ff993539393ff100fa93ed6a27 # v3.5.0
uses: docker/setup-buildx-action@988b5a0280414f521da01fcc63a27aeeb4b104db # v3.5.0

- name: Setup Go
uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
Expand Down
6 changes: 5 additions & 1 deletion .github/workflows/base-release.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,12 @@ jobs:
with:
platforms: arm64,ppc64le,linux/arm/v7,s390x

- uses: docker/setup-buildx-action@aa33708b10e362ff993539393ff100fa93ed6a27 # v3.5.0
<<<<<<< HEAD
pureklkl marked this conversation as resolved.
Show resolved Hide resolved
- uses: docker/setup-buildx-action@988b5a0280414f521da01fcc63a27aeeb4b104db # v3.5.0
if: ${{ runner.os != 'macOS' }} # docker is not available on macos
=======
- uses: docker/setup-buildx-action@988b5a0280414f521da01fcc63a27aeeb4b104db # v3.6.1
>>>>>>> main

- uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
with:
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.