From e554e04ba651978d8d1af5067a11a5bf2f4eade0 Mon Sep 17 00:00:00 2001 From: Liu Shilong Date: Wed, 24 Sep 2025 11:30:04 +0800 Subject: [PATCH 1/8] fix codeQL --- .github/workflows/codeql-analysis.yml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 8da1db9..9b4c149 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -69,15 +69,12 @@ jobs: git submodule foreach --recursive 'git remote update || true' git submodule update --init --recursive - - name: build-swss-common + - name: download-swss-common run: | set -x cd .. - git clone https://github.com/sonic-net/sonic-swss-common - cd sonic-swss-common - ./autogen.sh - fakeroot dpkg-buildpackage -us -uc -b - cd .. + curl "https://sonic-build.azurewebsites.net/api/sonic/artifacts?branchName=master&platform=vs&target=target/debs/bookworm/libswsscommon_1.0.0_amd64.deb" -o libswsscommon_1.0.0_amd64.deb + curl "https://sonic-build.azurewebsites.net/api/sonic/artifacts?branchName=master&platform=vs&target=target/debs/bookworm/libswsscommon-dev_1.0.0_amd64.deb" -o libswsscommon-dev_1.0.0_amd64.deb dpkg-deb -x libswsscommon_1.0.0_amd64.deb $(dirname $GITHUB_WORKSPACE) dpkg-deb -x libswsscommon-dev_1.0.0_amd64.deb $(dirname $GITHUB_WORKSPACE) From c51d5bbaa76e5537e21b31459ecac7ce83b61a00 Mon Sep 17 00:00:00 2001 From: Liu Shilong Date: Wed, 24 Sep 2025 12:58:22 +0800 Subject: [PATCH 2/8] fix --- .github/workflows/codeql-analysis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 9b4c149..a170b6b 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -73,8 +73,8 @@ jobs: run: | set -x cd .. - curl "https://sonic-build.azurewebsites.net/api/sonic/artifacts?branchName=master&platform=vs&target=target/debs/bookworm/libswsscommon_1.0.0_amd64.deb" -o libswsscommon_1.0.0_amd64.deb - curl "https://sonic-build.azurewebsites.net/api/sonic/artifacts?branchName=master&platform=vs&target=target/debs/bookworm/libswsscommon-dev_1.0.0_amd64.deb" -o libswsscommon-dev_1.0.0_amd64.deb + curl -L "https://sonic-build.azurewebsites.net/api/sonic/artifacts?branchName=master&platform=vs&target=target/debs/bookworm/libswsscommon_1.0.0_amd64.deb" -o libswsscommon_1.0.0_amd64.deb + curl -L "https://sonic-build.azurewebsites.net/api/sonic/artifacts?branchName=master&platform=vs&target=target/debs/bookworm/libswsscommon-dev_1.0.0_amd64.deb" -o libswsscommon-dev_1.0.0_amd64.deb dpkg-deb -x libswsscommon_1.0.0_amd64.deb $(dirname $GITHUB_WORKSPACE) dpkg-deb -x libswsscommon-dev_1.0.0_amd64.deb $(dirname $GITHUB_WORKSPACE) From 90dc2b6a09399da73fd02e0395467a6092dc669b Mon Sep 17 00:00:00 2001 From: Liu Shilong Date: Wed, 24 Sep 2025 13:21:36 +0800 Subject: [PATCH 3/8] fix --- .github/workflows/codeql-analysis.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index a170b6b..ed3090b 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -18,7 +18,7 @@ jobs: name: Analyze runs-on: ubuntu-latest container: - image: sonicdev-microsoft.azurecr.io:443/sonic-slave-bullseye:latest + image: sonicdev-microsoft.azurecr.io:443/sonic-slave-bookworm:latest permissions: actions: read contents: read @@ -69,14 +69,16 @@ jobs: git submodule foreach --recursive 'git remote update || true' git submodule update --init --recursive - - name: download-swss-common + - name: install-dependency run: | set -x cd .. curl -L "https://sonic-build.azurewebsites.net/api/sonic/artifacts?branchName=master&platform=vs&target=target/debs/bookworm/libswsscommon_1.0.0_amd64.deb" -o libswsscommon_1.0.0_amd64.deb curl -L "https://sonic-build.azurewebsites.net/api/sonic/artifacts?branchName=master&platform=vs&target=target/debs/bookworm/libswsscommon-dev_1.0.0_amd64.deb" -o libswsscommon-dev_1.0.0_amd64.deb + curl -L "https://sonic-build.azurewebsites.net/api/sonic/artifacts?branchName=master&platform=vs&target=target/debs/bookworm/libnl-3-dev_3.7.0-0.2+b1sonic1_amd64.deb" -o libnl-3-dev_3.7.0-0.2+b1sonic1_amd64.deb dpkg-deb -x libswsscommon_1.0.0_amd64.deb $(dirname $GITHUB_WORKSPACE) dpkg-deb -x libswsscommon-dev_1.0.0_amd64.deb $(dirname $GITHUB_WORKSPACE) + dpkg-deb -x libnl-3-dev_3.7.0-0.2+b1sonic1_amd64.deb $(dirname $GITHUB_WORKSPACE) - name: build run: | From 5a0e6378d33132fee2e73b515c00472986f28eb7 Mon Sep 17 00:00:00 2001 From: Liu Shilong Date: Wed, 24 Sep 2025 13:50:07 +0800 Subject: [PATCH 4/8] Fix prepare step --- .github/workflows/codeql-analysis.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index ed3090b..cff3fc4 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -56,9 +56,6 @@ jobs: swig \ uuid-dev \ libzmq3-dev \ - libyang-dev \ - libpython2.7-dev \ - python \ nlohmann-json3-dev - name: reset-submodules From 156fa93509e2f50b56e3a75e3d329c4ae8a273e8 Mon Sep 17 00:00:00 2001 From: Liu Shilong Date: Wed, 24 Sep 2025 13:57:34 +0800 Subject: [PATCH 5/8] fix --- .github/workflows/codeql-analysis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index cff3fc4..a2a7f2d 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -72,7 +72,7 @@ jobs: cd .. curl -L "https://sonic-build.azurewebsites.net/api/sonic/artifacts?branchName=master&platform=vs&target=target/debs/bookworm/libswsscommon_1.0.0_amd64.deb" -o libswsscommon_1.0.0_amd64.deb curl -L "https://sonic-build.azurewebsites.net/api/sonic/artifacts?branchName=master&platform=vs&target=target/debs/bookworm/libswsscommon-dev_1.0.0_amd64.deb" -o libswsscommon-dev_1.0.0_amd64.deb - curl -L "https://sonic-build.azurewebsites.net/api/sonic/artifacts?branchName=master&platform=vs&target=target/debs/bookworm/libnl-3-dev_3.7.0-0.2+b1sonic1_amd64.deb" -o libnl-3-dev_3.7.0-0.2+b1sonic1_amd64.deb + curl -L "https://sonic-build.azurewebsites.net/api/sonic/artifacts?branchName=master&platform=vs&target=target/debs/bookworm/libnl-3-dev_3.7.0-0.2%2Bb1sonic1_amd64.deb" -o libnl-3-dev_3.7.0-0.2+b1sonic1_amd64.deb dpkg-deb -x libswsscommon_1.0.0_amd64.deb $(dirname $GITHUB_WORKSPACE) dpkg-deb -x libswsscommon-dev_1.0.0_amd64.deb $(dirname $GITHUB_WORKSPACE) dpkg-deb -x libnl-3-dev_3.7.0-0.2+b1sonic1_amd64.deb $(dirname $GITHUB_WORKSPACE) From f7770c2b66763003e8e7538748bed5533ce30e95 Mon Sep 17 00:00:00 2001 From: Liu Shilong Date: Wed, 24 Sep 2025 14:02:20 +0800 Subject: [PATCH 6/8] fix --- .github/workflows/codeql-analysis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index a2a7f2d..3fbcf52 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -73,8 +73,10 @@ jobs: curl -L "https://sonic-build.azurewebsites.net/api/sonic/artifacts?branchName=master&platform=vs&target=target/debs/bookworm/libswsscommon_1.0.0_amd64.deb" -o libswsscommon_1.0.0_amd64.deb curl -L "https://sonic-build.azurewebsites.net/api/sonic/artifacts?branchName=master&platform=vs&target=target/debs/bookworm/libswsscommon-dev_1.0.0_amd64.deb" -o libswsscommon-dev_1.0.0_amd64.deb curl -L "https://sonic-build.azurewebsites.net/api/sonic/artifacts?branchName=master&platform=vs&target=target/debs/bookworm/libnl-3-dev_3.7.0-0.2%2Bb1sonic1_amd64.deb" -o libnl-3-dev_3.7.0-0.2+b1sonic1_amd64.deb + curl -L "https://sonic-build.azurewebsites.net/api/sonic/artifacts?branchName=master&platform=vs&target=target/debs/bookworm/libnl-3-200_3.7.0-0.2%2Bb1sonic1_amd64.deb" -o libnl-3-200_3.7.0-0.2+b1sonic1_amd64.deb dpkg-deb -x libswsscommon_1.0.0_amd64.deb $(dirname $GITHUB_WORKSPACE) dpkg-deb -x libswsscommon-dev_1.0.0_amd64.deb $(dirname $GITHUB_WORKSPACE) + dpkg-deb -x libnl-3-200_3.7.0-0.2+b1sonic1_amd64.deb $(dirname $GITHUB_WORKSPACE) dpkg-deb -x libnl-3-dev_3.7.0-0.2+b1sonic1_amd64.deb $(dirname $GITHUB_WORKSPACE) - name: build From 76d0e208b7e242e32f6800598eda1a94a7e10565 Mon Sep 17 00:00:00 2001 From: Liu Shilong Date: Wed, 24 Sep 2025 14:14:48 +0800 Subject: [PATCH 7/8] fix --- .github/workflows/codeql-analysis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 3fbcf52..66ac91c 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -76,7 +76,7 @@ jobs: curl -L "https://sonic-build.azurewebsites.net/api/sonic/artifacts?branchName=master&platform=vs&target=target/debs/bookworm/libnl-3-200_3.7.0-0.2%2Bb1sonic1_amd64.deb" -o libnl-3-200_3.7.0-0.2+b1sonic1_amd64.deb dpkg-deb -x libswsscommon_1.0.0_amd64.deb $(dirname $GITHUB_WORKSPACE) dpkg-deb -x libswsscommon-dev_1.0.0_amd64.deb $(dirname $GITHUB_WORKSPACE) - dpkg-deb -x libnl-3-200_3.7.0-0.2+b1sonic1_amd64.deb $(dirname $GITHUB_WORKSPACE) + dpkg-deb -i libnl-3-200_3.7.0-0.2+b1sonic1_amd64.deb dpkg-deb -x libnl-3-dev_3.7.0-0.2+b1sonic1_amd64.deb $(dirname $GITHUB_WORKSPACE) - name: build From d517add2bd9f0cacff8d932a21f411b47b117492 Mon Sep 17 00:00:00 2001 From: Liu Shilong Date: Wed, 24 Sep 2025 14:21:58 +0800 Subject: [PATCH 8/8] fix --- .github/workflows/codeql-analysis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 66ac91c..b987803 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -76,7 +76,7 @@ jobs: curl -L "https://sonic-build.azurewebsites.net/api/sonic/artifacts?branchName=master&platform=vs&target=target/debs/bookworm/libnl-3-200_3.7.0-0.2%2Bb1sonic1_amd64.deb" -o libnl-3-200_3.7.0-0.2+b1sonic1_amd64.deb dpkg-deb -x libswsscommon_1.0.0_amd64.deb $(dirname $GITHUB_WORKSPACE) dpkg-deb -x libswsscommon-dev_1.0.0_amd64.deb $(dirname $GITHUB_WORKSPACE) - dpkg-deb -i libnl-3-200_3.7.0-0.2+b1sonic1_amd64.deb + dpkg -i libnl-3-200_3.7.0-0.2+b1sonic1_amd64.deb dpkg-deb -x libnl-3-dev_3.7.0-0.2+b1sonic1_amd64.deb $(dirname $GITHUB_WORKSPACE) - name: build