Merge pull request #17 from networkservicemesh/af_packet

Fix af_packet issue
networkservicemesh · Nov 8, 2023 · 2484aa7 · 2484aa7
2 parents a46e6ce + 1f20ec7
commit 2484aa7
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -86,9 +86,9 @@ jobs:
           apt install docker-ce -y
       - name: Check out code
         uses: actions/checkout@v2
-      - uses: actions/setup-go@v1
+      - uses: actions/setup-go@v4
         with:
-          go-version: 1.20.5
+          go-version: 1.20.8
 
       # Use buildx to build for two platforms (amd64, arm64) in one image
       - name: Docker Build

diff --git a/.github/workflows/update-dependent-repositories.yaml b/.github/workflows/update-dependent-repositories.yaml
@@ -56,9 +56,9 @@ jobs:
           path: networkservicemesh/${{ matrix.repository }}
           repository: networkservicemesh/${{ matrix.repository }}
           token: ${{ secrets.token }}
-      - uses: actions/setup-go@v1
+      - uses: actions/setup-go@v4
         with:
-          go-version: 1.20.5
+          go-version: 1.20.8
       - name: Update ${{ matrix.repository }} locally
         working-directory: networkservicemesh/${{ matrix.repository }}
         run: |

diff --git a/patch/patch.sh b/patch/patch.sh
@@ -1,8 +1,8 @@
 #!/bin/bash
 set -ex
 
-git config --global user.name "John Doe"
-git config --global user.email "johndoe@example.com"
+git config user.name "John Doe"
+git config user.email "johndoe@example.com"
 
 function git_cherry_pick ()
 {
@@ -15,6 +15,7 @@ function git_cherry_pick ()
 # NSM cherry picks
 git_cherry_pick refs/changes/03/39503/1 # 39503: vppinfra: fix setns typo | https://gerrit.fd.io/r/c/vpp/+/39503
 git_cherry_pick refs/changes/28/39528/9 # 39528: ping: Simple binary API for running ping based on events | https://gerrit.fd.io/r/c/vpp/+/39528
+git_cherry_pick refs/changes/24/39824/1 # 39824: af_packet: remove UNIX_FILE_EVENT_EDGE_TRIGGERED flag | https://gerrit.fd.io/r/c/vpp/+/39824
 
 # Calico cherry picks
 git_cherry_pick refs/changes/26/34726/3 # 34726: interface: add buffer stats api | https://gerrit.fd.io/r/c/vpp/+/34726