diff options
| author | AlexSm <81806911+alexv-smirnov@users.noreply.github.com> | 2023-04-28 18:47:56 +0000 |
|---|---|---|
| committer | alexv-smirnov <alex@ydb.tech> | 2023-04-28 21:47:56 +0300 |
| commit | 789919dfbe29bedf4945d5bb484d92d8125c9a84 (patch) | |
| tree | 4a062917b388d0045fab7fd6b0fff296cf108a23 | |
| parent | ccfeba846eb9466d029983b4b6eb3c731c99e08c (diff) | |
| download | ydb-789919dfbe29bedf4945d5bb484d92d8125c9a84.tar.gz | |
"Fix sanitizer upload to testmo"
"Fix sanitizer upload to testmo"
Pull Request resolved: #186
| -rw-r--r-- | .github/actions/build/action.yml | 8 | ||||
| -rw-r--r-- | .github/actions/test/action.yml | 3 | ||||
| -rw-r--r-- | .github/workflows/nightly_run.yaml | 6 |
3 files changed, 9 insertions, 8 deletions
diff --git a/.github/actions/build/action.yml b/.github/actions/build/action.yml index 58d3353deb..ee2a8e4328 100644 --- a/.github/actions/build/action.yml +++ b/.github/actions/build/action.yml @@ -10,7 +10,7 @@ runs: steps: - name: Configure for sanitizer shell: bash - if: startsWith(inputs.sanitizer,'sanitize=') + if: inputs.sanitizer run: | mkdir -p ../build patch -p1 < ydb/deploy/patches/0001-sanitizer-build.patch @@ -18,12 +18,12 @@ runs: rm -rf * cmake -G Ninja -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \ -DCMAKE_TOOLCHAIN_FILE=../ydb/clang.toolchain \ - -DCMAKE_CXX_FLAGS="-f${{ inputs.sanitizer }} -fno-omit-frame-pointer" \ - -DCMAKE_C_FLAGS="-f${{ inputs.sanitizer }} -fno-omit-frame-pointer" \ + -DCMAKE_CXX_FLAGS="-fsanitize=${{ inputs.sanitizer }} -fno-omit-frame-pointer" \ + -DCMAKE_C_FLAGS="-fsanitize=${{ inputs.sanitizer }} -fno-omit-frame-pointer" \ ../ydb - name: Configure shell: bash - if: false == startsWith(inputs.sanitizer,'sanitize=') + if: ${{!inputs.sanitizer}} run: | mkdir -p ../build cd ../build diff --git a/.github/actions/test/action.yml b/.github/actions/test/action.yml index adf0d7b685..e2b83ff73d 100644 --- a/.github/actions/test/action.yml +++ b/.github/actions/test/action.yml @@ -53,7 +53,8 @@ runs: testmo automation:resources:add-link --name build --url $RUN_URL --resources testmo.json testmo automation:resources:add-field --name git-sha --type string --value ${GITHUB_SHA:0:7} --resources testmo.json testmo automation:run:create --instance "$TESTMO_URL" --project-id ${{inputs.testman_project_id}} --name "${{ github.run_id }}" \ - --source "${{inputs.log_suffix}}" --resources testmo.json | \ + --source "${{inputs.log_suffix}}" --resources testmo.json \ + --tags "$GITHUB_REF_NAME" | \ echo "runid=$(cat)" >> $GITHUB_OUTPUT - name: Test shell: bash diff --git a/.github/workflows/nightly_run.yaml b/.github/workflows/nightly_run.yaml index 3524b3a9e2..48bdf750d1 100644 --- a/.github/workflows/nightly_run.yaml +++ b/.github/workflows/nightly_run.yaml @@ -13,7 +13,7 @@ jobs: name: Build/test X64 strategy: matrix: - sanitizer: [ "", "sanitize=address" ] + sanitizer: [ "", "address" ] fail-fast: false uses: ./.github/workflows/build_and_test_ondemand.yml @@ -26,11 +26,11 @@ jobs: name: Build/test ARM64 strategy: matrix: - sanitizer: [ "", "sanitize=address" ] + sanitizer: [ "", "address" ] fail-fast: false uses: ./.github/workflows/build_and_test_provisioned.yml with: runner_label: ARM64 sanitizer: ${{matrix.sanitizer}} test_label_regexp: ${{inputs.test_label_regexp}} - secrets: inherit
\ No newline at end of file + secrets: inherit |