From 6b4feb463bc01b2d93baf6e0ee4fae58547065c9 Mon Sep 17 00:00:00 2001
From: Thibault Charbonnier <thibaultcha@me.com>
Date: Mon, 11 Sep 2023 08:22:26 -0700
Subject: [PATCH 1/3] chore(ci) restore Codecov support alongside Coveralls

Codecov has a couple features that Coveralls lacks: better PR comments
and PR diff comments of uncovered lines. It's also easier to maintain
compared to the `carryforward` flags of Coveralls.
---
 .github/workflows/job-unit-tests.yml |  6 ++++++
 codecov.yml                          | 28 ++++++++++++++++++++++++++++
 2 files changed, 34 insertions(+)
 create mode 100644 codecov.yml

diff --git a/.github/workflows/job-unit-tests.yml b/.github/workflows/job-unit-tests.yml
index 3e6ee4298..a4457b0f0 100644
--- a/.github/workflows/job-unit-tests.yml
+++ b/.github/workflows/job-unit-tests.yml
@@ -146,6 +146,12 @@ jobs:
           flag-name: ${{ steps.lcov.outputs.name }}
           path-to-lcov: './lcov.info'
           parallel: true
+      - name: Codecov Upload
+        if: ${{ !env.ACT && inputs.coverage }}
+        uses: codecov/codecov-action@v3
+        with:
+          token: ${{ secrets.CODECOV_TOKEN }}
+          files: './lcov.info'
       - uses: actions/upload-artifact@v2
         if: ${{ failure() && !env.ACT }}
         with:
diff --git a/codecov.yml b/codecov.yml
new file mode 100644
index 000000000..07eb8f3e9
--- /dev/null
+++ b/codecov.yml
@@ -0,0 +1,28 @@
+# https://docs.codecov.io/docs/codecovyml-reference
+codecov:
+  require_ci_to_pass: yes
+  notify:
+    wait_for_ci: yes
+    after_n_builds: 9
+
+coverage:
+  precision: 4
+  round: down
+  range: "75...100"
+  status:
+    project:
+      default:
+        target: auto
+        threshold: 3%
+        base: auto
+        flags:
+          - unit
+        paths:
+          - src
+
+comment:
+  layout: "reach, diff, files"
+  behavior: default
+  require_changes: false
+  require_base: no
+  require_head: yes

From 7b182a91f89380b764be836f71329ee7afcc5541 Mon Sep 17 00:00:00 2001
From: Thibault Charbonnier <thibaultcha@me.com>
Date: Mon, 11 Sep 2023 11:30:51 -0700
Subject: [PATCH 2/3] tests(openresty) disable a test with Valgrind mode

Attempted to be re-enabled in #408 but unfortunately the nature of the
test makes it flaky in Valgrind CI.
---
 t/04-openresty/lua-bridge/003-proxy_wasm_lua_resolver_timeouts.t | 1 +
 1 file changed, 1 insertion(+)

diff --git a/t/04-openresty/lua-bridge/003-proxy_wasm_lua_resolver_timeouts.t b/t/04-openresty/lua-bridge/003-proxy_wasm_lua_resolver_timeouts.t
index 1d50b0437..19da85e83 100644
--- a/t/04-openresty/lua-bridge/003-proxy_wasm_lua_resolver_timeouts.t
+++ b/t/04-openresty/lua-bridge/003-proxy_wasm_lua_resolver_timeouts.t
@@ -105,6 +105,7 @@ Using a non-local resolver
 lua-resty-dns-resolver client timeout
 Behaves strangely on GHA Valgrind. Seems fine locally.
 Will run with TEST_NGINX_USE_VALGRIND_ALL.
+--- skip_valgrind: 5
 --- load_nginx_modules: ngx_http_echo_module
 --- main_config eval
 qq{

From 7c4c2a431ba6cdded55d044cb6b4336bb04eb23c Mon Sep 17 00:00:00 2001
From: Thibault Charbonnier <thibaultcha@me.com>
Date: Wed, 13 Sep 2023 09:51:18 -0700
Subject: [PATCH 3/3] chore(ci) increase clang-analyzer timeout to 30min

---
 .github/workflows/job-clang-analyzer.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/job-clang-analyzer.yml b/.github/workflows/job-clang-analyzer.yml
index 9748cf5ed..7cbd76212 100644
--- a/.github/workflows/job-clang-analyzer.yml
+++ b/.github/workflows/job-clang-analyzer.yml
@@ -46,7 +46,7 @@ jobs:
   analyzer:
     name: 'Clang analyzer'
     runs-on: ubuntu-latest
-    timeout-minutes: 20
+    timeout-minutes: 30
     steps:
       - run: |
           sudo apt-get update