From d9ac36ed804dce1d318f5e97bf0bda591bee37e5 Mon Sep 17 00:00:00 2001 From: Liam Galvin Date: Mon, 7 Nov 2022 22:14:17 +0000 Subject: [PATCH 1/5] build: Add go linter --- .github/workflows/lint.yml | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 .github/workflows/lint.yml diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml new file mode 100644 index 0000000..4e29e0f --- /dev/null +++ b/.github/workflows/lint.yml @@ -0,0 +1,21 @@ +name: golangci-lint +on: + pull_request: +permissions: + contents: read + pull-requests: read +jobs: + golangci: + name: Run golangci-lint + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - uses: actions/setup-go@v3 + with: + go-version-file: go.mod + cache: true + cache-dependency-path: go.sum + - name: golangci-lint + uses: golangci/golangci-lint-action@v3.2.0 + with: + args: --timeout 3m --verbose \ No newline at end of file From 7e3aec650f7dd3b84bdb391eaa02b48c22e99673 Mon Sep 17 00:00:00 2001 From: Liam Galvin Date: Mon, 7 Nov 2022 22:22:04 +0000 Subject: [PATCH 2/5] Update futex.go --- tracer/annotation/futex.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tracer/annotation/futex.go b/tracer/annotation/futex.go index 2a47acb..5954ffa 100644 --- a/tracer/annotation/futex.go +++ b/tracer/annotation/futex.go @@ -14,7 +14,7 @@ var futexOps = map[int]string{ 10: "FUTEX_WAKE_BITSET", 11: "FUTEX_WAIT_REQUEUE_PI", 12: "FUTEX_CMP_REQUEUE_PI", - 128 | 0: "FUTEX_PRIVATE_FLAG|FUTEX_WAIT", + 128: "FUTEX_PRIVATE_FLAG|FUTEX_WAIT", 128 | 1: "FUTEX_PRIVATE_FLAG|FUTEX_WAKE", 128 | 2: "FUTEX_PRIVATE_FLAG|FUTEX_FD", 128 | 3: "FUTEX_PRIVATE_FLAG|FUTEX_REQUEUE", @@ -27,7 +27,7 @@ var futexOps = map[int]string{ 128 | 10: "FUTEX_PRIVATE_FLAG|FUTEX_WAKE_BITSET", 128 | 11: "FUTEX_PRIVATE_FLAG|FUTEX_WAIT_REQUEUE_PI", 128 | 12: "FUTEX_PRIVATE_FLAG|FUTEX_CMP_REQUEUE_PI", - 256 | 0: "FUTEX_CLOCK_REALTIME|FUTEX_WAIT", + 256: "FUTEX_CLOCK_REALTIME|FUTEX_WAIT", 256 | 1: "FUTEX_CLOCK_REALTIME|FUTEX_WAKE", 256 | 2: "FUTEX_CLOCK_REALTIME|FUTEX_FD", 256 | 3: "FUTEX_CLOCK_REALTIME|FUTEX_REQUEUE", @@ -40,7 +40,7 @@ var futexOps = map[int]string{ 256 | 10: "FUTEX_CLOCK_REALTIME|FUTEX_WAKE_BITSET", 256 | 11: "FUTEX_CLOCK_REALTIME|FUTEX_WAIT_REQUEUE_PI", 256 | 12: "FUTEX_CLOCK_REALTIME|FUTEX_CMP_REQUEUE_PI", - 384 | 0: "FUTEX_CLOCK_REALTIME|FUTEX_PRIVATE_FLAG|FUTEX_WAIT", + 384: "FUTEX_CLOCK_REALTIME|FUTEX_PRIVATE_FLAG|FUTEX_WAIT", 384 | 1: "FUTEX_CLOCK_REALTIME|FUTEX_PRIVATE_FLAG|FUTEX_WAKE", 384 | 2: "FUTEX_CLOCK_REALTIME|FUTEX_PRIVATE_FLAG|FUTEX_FD", 384 | 3: "FUTEX_CLOCK_REALTIME|FUTEX_PRIVATE_FLAG|FUTEX_REQUEUE", From 09ca07eacc6b304709e4c86ab7a882e43760c195 Mon Sep 17 00:00:00 2001 From: Liam Galvin Date: Mon, 7 Nov 2022 22:27:34 +0000 Subject: [PATCH 3/5] Update lint.yml --- .github/workflows/lint.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 4e29e0f..e9042e9 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -15,7 +15,8 @@ jobs: go-version-file: go.mod cache: true cache-dependency-path: go.sum + - run: make headers - name: golangci-lint uses: golangci/golangci-lint-action@v3.2.0 with: - args: --timeout 3m --verbose \ No newline at end of file + args: --timeout 3m --verbose From d9498084f1f26a4d4f7f644709b5c2a37d18de57 Mon Sep 17 00:00:00 2001 From: Liam Galvin Date: Mon, 7 Nov 2022 22:31:19 +0000 Subject: [PATCH 4/5] Update lint.yml --- .github/workflows/lint.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index e9042e9..14ec908 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -13,7 +13,7 @@ jobs: - uses: actions/setup-go@v3 with: go-version-file: go.mod - cache: true + cache: false cache-dependency-path: go.sum - run: make headers - name: golangci-lint From 5f35a52faeca5133dddc04f0209256109c619f4f Mon Sep 17 00:00:00 2001 From: Liam Galvin Date: Mon, 7 Nov 2022 22:44:02 +0000 Subject: [PATCH 5/5] Update lint.yml --- .github/workflows/lint.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 14ec908..6fde4a0 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -4,6 +4,8 @@ on: permissions: contents: read pull-requests: read +env: + CGO_CFLAGS: "-Iheaders/include" jobs: golangci: name: Run golangci-lint