From 977fc19f5b1c717c96d7801a6b17911fdc89ff93 Mon Sep 17 00:00:00 2001 From: Leonardo Parente <23251360+leoparente@users.noreply.github.com> Date: Mon, 13 Jan 2025 13:39:15 -0300 Subject: [PATCH] test package --- .github/actions/build-cpp/entrypoint.sh | 4 ++-- .github/workflows/build-develop.yml | 10 +++++----- .github/workflows/build-release.yml | 8 ++++---- .github/workflows/build_debug.yml | 4 ++-- .github/workflows/code-ql.yml | 4 ++-- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.github/actions/build-cpp/entrypoint.sh b/.github/actions/build-cpp/entrypoint.sh index 8637c155b..fd7a5eb4f 100644 --- a/.github/actions/build-cpp/entrypoint.sh +++ b/.github/actions/build-cpp/entrypoint.sh @@ -33,14 +33,14 @@ function move() { cp -rf /pktvisor-src/build/bin/crashpad_handler /github/workspace/ cp -rf /pktvisor-src/build/bin/pktvisor-reader /github/workspace/ cp -rf /pktvisor-src/build/VERSION /github/workspace/ - cp -rf /pktvisor-src/build/ /github/workspace/build/ + cp -rf /pktvisor-src/build/p/ /github/workspace/build/ cp -rf /pktvisor-src/golang/pkg/client/version.go /github/workspace/version.go cp -rf /pktvisor-src/src/tests/fixtures/pktvisor-port-service-names.csv /github/workspace/custom-iana.csv } function publishToBugsplat() { echo "========================= Publishing symbol to bugsplat =========================" - cd /tmp/build + cd /pktvisor-src/build/ if [ "$INPUT_BUGSPLAT" == "true" ]; then wget https://github.com/orb-community/CrashpadTools/raw/main/linux/dump_syms chmod a+x ./dump_syms diff --git a/.github/workflows/build-develop.yml b/.github/workflows/build-develop.yml index 1003fbe9d..b39d670d6 100644 --- a/.github/workflows/build-develop.yml +++ b/.github/workflows/build-develop.yml @@ -41,7 +41,7 @@ jobs: - name: Setup Conan Cache uses: actions/cache@v4 with: - path: ${{github.workspace}}/build/conan_home/ + path: ${{github.workspace}}//build/p/ key: conan-${{ runner.os }}-${{ hashFiles('conanfile.py', '*/conanfile.py') }} restore-keys: conan-${{ runner.os }}- @@ -81,7 +81,7 @@ jobs: - name: Setup Conan Cache uses: actions/cache@v4 with: - path: ${{github.workspace}}/build/conan_home/ + path: ${{github.workspace}}//build/p/ key: conan-${{ runner.os }}-${{ hashFiles('conanfile.py', '*/conanfile.py') }} restore-keys: conan-${{ runner.os }}- @@ -123,7 +123,7 @@ jobs: - name: Setup Conan Cache uses: actions/cache@v4 with: - path: ${{github.workspace}}/build/conan_home/ + path: ${{github.workspace}}//build/p/ key: conan-${{ runner.os }}-${{ hashFiles('conanfile.py', '*/conanfile.py') }} restore-keys: conan-${{ runner.os }}- @@ -230,7 +230,7 @@ jobs: - name: Setup Conan Cache uses: actions/cache@v4 with: - path: ${{github.workspace}}/build/conan_home/ + path: ${{github.workspace}}//build/p/ key: conan-${{ runner.os }}-${{ hashFiles('conanfile.py', '*/conanfile.py') }} restore-keys: conan-${{ runner.os }}- @@ -403,7 +403,7 @@ jobs: - name: Setup Conan Cache uses: actions/cache@v4 with: - path: ${{github.workspace}}/build/conan_home/ + path: ${{github.workspace}}//build/p/ key: conan-${{ runner.os }}-arm64-${{ hashFiles('conanfile.py', '*/conanfile.py') }} restore-keys: conan-${{ runner.os }}-arm64- diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml index 4489db275..6c089a444 100644 --- a/.github/workflows/build-release.yml +++ b/.github/workflows/build-release.yml @@ -35,7 +35,7 @@ jobs: - name: Setup Conan Cache uses: actions/cache@v4 with: - path: ${{github.workspace}}/build/conan_home/ + path: ${{github.workspace}}//build/p/ key: conan-${{ runner.os }}-${{ hashFiles('conanfile.py', '*/conanfile.py') }} restore-keys: conan-${{ runner.os }}- @@ -171,7 +171,7 @@ jobs: - name: Setup Conan Cache uses: actions/cache@v4 with: - path: ${{github.workspace}}/build/conan_home/ + path: ${{github.workspace}}//build/p/ key: conan-${{ runner.os }}-${{ hashFiles('conanfile.py', '*/conanfile.py') }} restore-keys: conan-${{ runner.os }}- @@ -281,7 +281,7 @@ jobs: - name: Setup Conan Cache uses: actions/cache@v4 with: - path: ${{github.workspace}}/build/conan_home/ + path: ${{github.workspace}}//build/p/ key: conan-${{ runner.os }}-arm64-${{ hashFiles('conanfile.py', '*/conanfile.py') }} restore-keys: conan-${{ runner.os }}-arm64- @@ -400,7 +400,7 @@ jobs: - name: Setup Conan Cache uses: actions/cache@v4 with: - path: ${{github.workspace}}/build/conan_home/ + path: ${{github.workspace}}//build/p/ key: conan-${{ runner.os }}-${{ hashFiles('conanfile.py', '*/conanfile.py') }} restore-keys: conan-${{ runner.os }}- diff --git a/.github/workflows/build_debug.yml b/.github/workflows/build_debug.yml index fd45b1488..3eaefe464 100644 --- a/.github/workflows/build_debug.yml +++ b/.github/workflows/build_debug.yml @@ -30,7 +30,7 @@ jobs: - name: Setup Conan Cache uses: actions/cache@v4 with: - path: ${{github.workspace}}/build/conan_home/ + path: ${{github.workspace}}/build/p/ key: conan-${{ runner.os }}-${{ hashFiles('conanfile.py', '*/conanfile.py') }} restore-keys: conan-${{ runner.os }}- @@ -81,7 +81,7 @@ jobs: - name: Setup Conan Cache uses: actions/cache@v4 with: - path: ${{github.workspace}}/build/conan_home/ + path: ${{github.workspace}}/build/p/ key: conan-${{ runner.os }}-${{ hashFiles('conanfile.py', '*/conanfile.py') }} restore-keys: conan-${{ runner.os }}- diff --git a/.github/workflows/code-ql.yml b/.github/workflows/code-ql.yml index 17214dbf4..582c99891 100644 --- a/.github/workflows/code-ql.yml +++ b/.github/workflows/code-ql.yml @@ -74,7 +74,7 @@ jobs: # build and run tests sudo make all test #remove conan files - rm -rf conan_home/ + rm -rf p/ - name: Perform CodeQL Analysis uses: github/codeql-action/analyze@v3 @@ -87,7 +87,7 @@ jobs: uses: advanced-security/filter-sarif@v1 with: patterns: | - -pktvisor/build/conan_home/**/* + -pktvisor/build/p/**/* input: sarif-results/cpp.sarif output: sarif-results/cpp.sarif