From 22f8d905af6fb48e8135404e8931dc939761b875 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A1bor=20Barna?= Date: Tue, 22 Aug 2023 11:01:52 +0200 Subject: [PATCH 1/3] It is enough to set the git repo's user Instead of modifying the global config, only set the dummy user in the git repo where the patches are applied. This way the global user setting is kept. Signed-off-by: Artem Glazychev --- patch/patch.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/patch/patch.sh b/patch/patch.sh index ef7233b4..adc5a183 100755 --- 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 () { From e7b4b2d8616510430f188b3e9e362932a0e62fa5 Mon Sep 17 00:00:00 2001 From: Artem Glazychev Date: Fri, 3 Nov 2023 13:34:23 +0700 Subject: [PATCH 2/3] Fix af_packet issue Signed-off-by: Artem Glazychev --- patch/patch.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/patch/patch.sh b/patch/patch.sh index adc5a183..31a24c97 100755 --- a/patch/patch.sh +++ b/patch/patch.sh @@ -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 From 1f20ec7b9ded2a508e206fe5feeb1451c57e6606 Mon Sep 17 00:00:00 2001 From: Artem Glazychev Date: Tue, 7 Nov 2023 22:46:47 +0700 Subject: [PATCH 3/3] Update ci go version Signed-off-by: Artem Glazychev --- .github/workflows/ci.yaml | 4 ++-- .github/workflows/update-dependent-repositories.yaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index ace4532f..bb4d4c12 100644 --- 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 index 39199e39..d49f9d44 100644 --- 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: |