From 70e7b1ae4a3f3cd0009cbcc81e66330780c16653 Mon Sep 17 00:00:00 2001
From: Evgenii Kliuchnikov <eustas@google.com>
Date: Thu, 6 Jul 2023 11:56:38 +0000
Subject: simplify building of fuzzer

PiperOrigin-RevId: 545950923
---
 .github/workflows/build_test.yml | 15 +++++++++++++--
 .github/workflows/codeql.yml     |  4 ++++
 .github/workflows/fuzz.yml       |  5 +++++
 .github/workflows/release.yaml   |  4 ++++
 .github/workflows/scorecard.yml  |  4 ++++
 5 files changed, 30 insertions(+), 2 deletions(-)

(limited to '.github')

diff --git a/.github/workflows/build_test.yml b/.github/workflows/build_test.yml
index 31bcd64..590a54a 100644
--- a/.github/workflows/build_test.yml
+++ b/.github/workflows/build_test.yml
@@ -13,6 +13,10 @@ on:
   pull_request:
     types: [opened, reopened, labeled, synchronize]
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}-${{ github.event_name }}
+  cancel-in-progress: ${{ github.event_name == 'pull_request' }}
+
 jobs:
   ubuntu_build:
     name: Build and test ${{ matrix.name }}
@@ -288,8 +292,15 @@ jobs:
     - name: Quick Fuzz
       if: ${{ matrix.build_system == 'fuzz' }}
       run: |
-        export ASAN_OPTIONS=detect_leaks=0
-        ./c/fuzz/test_fuzzer.sh
+        mkdir ${RUNNER_TEMP}/decode_corpora
+        unzip java/org/brotli/integration/fuzz_data.zip -d ${RUNNER_TEMP}/decode_corpora
+        cd ${GITHUB_WORKSPACE}/c/fuzz
+        bazelisk build --config=asan-libfuzzer :decode_fuzzer
+        for f in `ls ${RUNNER_TEMP}/decode_corpora`
+        do
+          echo "Testing $f"
+          ./bazel-bin/decode_fuzzer_bin ${RUNNER_TEMP}/decode_corpora/$f
+        done
 
     - name: Build with Bazel
       if: ${{ matrix.build_system == 'bazel' }}
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index 1df6419..fad20e2 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -9,6 +9,10 @@ on:
   schedule:
     - cron: '18 15 * * 0'
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}-${{ github.event_name }}
+  cancel-in-progress: ${{ github.event_name == 'pull_request' }}
+
 jobs:
   analyze:
     name: Analyze
diff --git a/.github/workflows/fuzz.yml b/.github/workflows/fuzz.yml
index 77188ab..78e71e3 100644
--- a/.github/workflows/fuzz.yml
+++ b/.github/workflows/fuzz.yml
@@ -7,6 +7,11 @@
 
 name: CIFuzz
 on: [pull_request]
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}-${{ github.event_name }}
+  cancel-in-progress: ${{ github.event_name == 'pull_request' }}
+
 jobs:
   Fuzzing:
     runs-on: ubuntu-latest
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 967d5f6..0f2be31 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -14,6 +14,10 @@ on:
   release:
     types: [ published ]
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}-${{ github.event_name }}
+  cancel-in-progress: ${{ github.event_name == 'pull_request' }}
+
 jobs:
   windows_build:
     name: Windows Build (vcpkg / ${{ matrix.triplet }})
diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index a71f9f8..9b544e6 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -14,6 +14,10 @@ on:
   push:
     branches: [ "master" ]
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}-${{ github.event_name }}
+  cancel-in-progress: ${{ github.event_name == 'pull_request' }}
+
 # Declare default permissions as read only.
 permissions: read-all
 
-- 
cgit v1.1