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.

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

chore!: remove helpers package #473

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open
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
12 changes: 3 additions & 9 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,9 @@ updates:
directory: "/"
schedule:
interval: daily
# - package-ecosystem: "github-actions"
# directory: "/helpers"
# schedule:
# interval: daily
- package-ecosystem: "gomod"
directory: "/"
directories:
- "/"
- "/selftest/**/*"
Copy link
Member Author

Choose a reason for hiding this comment

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

Opportunistic change.

schedule:
interval: daily
# - package-ecosystem: "gomod"
# directory: "/helpers"
# schedule:
# interval: daily
21 changes: 4 additions & 17 deletions .github/workflows/pr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -68,28 +68,15 @@ jobs:
- name: Test libbpfgo
run: |
make libbpfgo-static-test
helpers-unit-tests:
name: Helpers Unit Tests
runs-on: ubuntu-24.04
strategy:
matrix:
go-version: [ '1.18', '1.19', '1.20', '1.21', '1.22', 'stable' ]
steps:
- name: Checkout Code
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
- name: Install Dependencies
uses: ./.github/actions/build-dependencies
with:
go-version: ${{ matrix.go-version }}
- name: Test Helpers
run: |
make helpers-test-static-run
self-tests:
name: Selftests
runs-on: ubuntu-24.04
strategy:
matrix:
go-version: [ '1.18', '1.19', '1.20', '1.21', '1.22', 'stable' ]
# Some self-tests now depend on the environment package from Tracee, which
# utilizes the Go toolchain directive. Therefore, this matrix must only include
# Go versions that support this directive.
go-version: [ '1.21', '1.22', 'stable' ]
steps:
- name: Checkout Code
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
Expand Down
18 changes: 0 additions & 18 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ BASEDIR = $(abspath ./)

OUTPUT = ./output
SELFTEST = ./selftest
HELPERS = ./helpers

CLANG := clang
CC := $(CLANG)
Expand Down Expand Up @@ -162,23 +161,6 @@ selftest-dynamic-run:
selftest-clean:
$(call FOREACH, clean)

# helpers test

.PHONY: helpers-test-run
.PHONY: helpers-test-static-run
.PHONY: helpers-test-dynamic-run

helpers-test-run: helpers-test-static-run

helpers-test-static-run: libbpfgo-static
CC=$(CLANG) \
CGO_CFLAGS=$(CGO_CFLAGS_STATIC) \
CGO_LDFLAGS=$(CGO_LDFLAGS_STATIC) \
sudo -E env PATH=$(PATH) $(GO) test -v $(HELPERS)/...

helpers-test-dynamic-run: libbpfgo-dynamic
sudo $(GO) test -v $(HELPERS)/...

# vagrant

VAGRANT_DIR = $(abspath ./builder)
Expand Down
3 changes: 0 additions & 3 deletions Readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ Currently you will find the following GNU Makefile rules:
| clean | cleans entire tree |
| selftest | builds all selftests (static) |
| selftest-run | runs all selftests (static) |
| helpers-test-run | runs all helpers tests (static) |

* libbpf dynamically linked (libbpf from OS)

Expand All @@ -47,7 +46,6 @@ Currently you will find the following GNU Makefile rules:
| libbpfgo-dynamic-test | 'go test' with dynamic libbpfgo |
| selftest-dynamic | build tests with dynamic libbpfgo |
| selftest-dynamic-run | run tests using dynamic libbpfgo |
| helpers-test-dynamic-run | run helpers package unit tests using dynamic libbpfgo |

* statically compiled (libbpf submodule)

Expand All @@ -57,7 +55,6 @@ Currently you will find the following GNU Makefile rules:
| libbpfgo-static-test | 'go test' with static libbpfgo |
| selftest-static | build tests with static libbpfgo |
| selftest-static-run | run tests using static libbpfgo |
| helpers-test-static-run | run helpers package unit tests using static libbpfgo |

* examples

Expand Down
135 changes: 0 additions & 135 deletions docs/helpers.md

This file was deleted.

6 changes: 0 additions & 6 deletions go.work

This file was deleted.

Loading
Loading