From 8c41e5d7dbf16b6724a69a7d2fe99ed9436ed3cb Mon Sep 17 00:00:00 2001 From: Artem Rys Date: Thu, 11 Apr 2024 15:31:11 +0200 Subject: [PATCH] chore: merge with main --- .github/workflows/reusable-build-test-release.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/reusable-build-test-release.yml b/.github/workflows/reusable-build-test-release.yml index b653bfb48..f39410727 100644 --- a/.github/workflows/reusable-build-test-release.yml +++ b/.github/workflows/reusable-build-test-release.yml @@ -869,11 +869,7 @@ jobs: name: package-splunkbase path: build/package/ - name: Scan -<<<<<<< HEAD - uses: splunk/appinspect-cli-action@v2.5 -======= uses: splunk/appinspect-cli-action@v2.6 ->>>>>>> main with: app_path: build/package/ included_tags: ${{ matrix.tags }}