From 7e939dfe12fe5952c942a3f76c17931f5d78face Mon Sep 17 00:00:00 2001
From: Alex Gaynor <alex.gaynor@gmail.com>
Date: Sat, 17 Apr 2021 16:53:26 -0400
Subject: [PATCH 01/17] [wip] attempt to use GHA for generating coverage
 reports

---
 .github/actions/merge-coverage/action.yml  | 31 ++++++++++++++++++++++
 .github/actions/upload-coverage/action.yml | 17 ++++++------
 .github/workflows/ci.yml                   |  9 +++++++
 3 files changed, 49 insertions(+), 8 deletions(-)
 create mode 100644 .github/actions/merge-coverage/action.yml

diff --git a/.github/actions/merge-coverage/action.yml b/.github/actions/merge-coverage/action.yml
new file mode 100644
index 000000000000..393af02fe5ca
--- /dev/null
+++ b/.github/actions/merge-coverage/action.yml
@@ -0,0 +1,31 @@
+name: Merge Coverage
+description: merge coverage
+
+runs:
+  using: "composite"
+
+  steps:
+    - uses: actions/download-artifact@v2
+      with:
+        path: coverage/
+    - run: pip install lcov_cobertura
+      shell: bash
+    - run: |
+        for p in $(find coverage/ -iname "*.lcov"); do
+          lcov_cobertura "$p" -o "${p%.lcov}.xml"
+        done
+      shell: bash
+    - run: sudo apt install cobertura
+      shell: bash
+    - run: |
+        cobertura-merge --datafile final-coverage.xml \
+          $(for p in $(find coverage/ -iname "*.xml"); do printf "%s " "$p"; done)
+      shell: bash
+    - run: cobertura-report --datafile final-coverage.xml --destination html-coverage/
+      shell: bash
+    - uses: actions/upload-artifact@v2
+      with:
+        name: final-coverage
+        path: html-coverage/
+    - run: cobertura-check --datafile final-coverage.xml --line=100 --branch=100
+      shell: bash
diff --git a/.github/actions/upload-coverage/action.yml b/.github/actions/upload-coverage/action.yml
index 11d97a7a614d..f42fdf846325 100644
--- a/.github/actions/upload-coverage/action.yml
+++ b/.github/actions/upload-coverage/action.yml
@@ -1,19 +1,20 @@
 name: Upload Coverage
-description: Upload coverage to codecov
+description: Upload coverage
 
 inputs:
   name:
-    description: "Job name"
+    description: "Job name (must be unique within workflow)"
     required: true
 
 runs:
   using: "composite"
 
   steps:
-    - run: |
-        curl -o codecov.sh -f https://codecov.io/bash || \
-          curl -o codecov.sh -f https://codecov.io/bash || \
-          curl -o codecov.sh -f https://codecov.io/bash
-
-        bash codecov.sh -n "${{ inputs.name }}"
+    - run: coverage xml
       shell: bash
+    - uses: actions/upload-artifact@v2
+      with:
+        name: coverage-${{ inputs.name }}
+        path: |
+            coverage.xml
+            rust-cov.lcov
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a95d004ef671..629bc76762f2 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -512,3 +512,12 @@ jobs:
     - run: echo "😢"; exit 1
       if: ${{ needs.linux.result != 'success' || needs.linux-distros.result != 'success' || needs.linux-rust.result != 'success' || needs.linux-rust-coverage.result != 'success' || needs.macos.result != 'success' || needs.windows.result != 'success' || needs.linux-downstream.result != 'success' }}
     - run: echo "🎉"
+
+  merge-coverage:
+    runs-on: ubuntu-latest
+    needs: [linux, linux-distros, linux-rust, linux-rust-coverage, macos, windows]
+    name: "Merge Coverage"
+    timeout-minutes: 10
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ./.github/actions/merge-coverage

From f356b2b8e916edb031828f940cd28fa6410780c0 Mon Sep 17 00:00:00 2001
From: Alex Gaynor <alex.gaynor@gmail.com>
Date: Sun, 18 Apr 2021 11:36:00 -0400
Subject: [PATCH 02/17] Port to stand-alone thing

---
 .github/actions/merge-coverage/action.yml  | 31 ----------------------
 .github/actions/upload-coverage/action.yml | 20 --------------
 .github/workflows/ci.yml                   | 22 ++++++++++-----
 3 files changed, 15 insertions(+), 58 deletions(-)
 delete mode 100644 .github/actions/merge-coverage/action.yml
 delete mode 100644 .github/actions/upload-coverage/action.yml

diff --git a/.github/actions/merge-coverage/action.yml b/.github/actions/merge-coverage/action.yml
deleted file mode 100644
index 393af02fe5ca..000000000000
--- a/.github/actions/merge-coverage/action.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-name: Merge Coverage
-description: merge coverage
-
-runs:
-  using: "composite"
-
-  steps:
-    - uses: actions/download-artifact@v2
-      with:
-        path: coverage/
-    - run: pip install lcov_cobertura
-      shell: bash
-    - run: |
-        for p in $(find coverage/ -iname "*.lcov"); do
-          lcov_cobertura "$p" -o "${p%.lcov}.xml"
-        done
-      shell: bash
-    - run: sudo apt install cobertura
-      shell: bash
-    - run: |
-        cobertura-merge --datafile final-coverage.xml \
-          $(for p in $(find coverage/ -iname "*.xml"); do printf "%s " "$p"; done)
-      shell: bash
-    - run: cobertura-report --datafile final-coverage.xml --destination html-coverage/
-      shell: bash
-    - uses: actions/upload-artifact@v2
-      with:
-        name: final-coverage
-        path: html-coverage/
-    - run: cobertura-check --datafile final-coverage.xml --line=100 --branch=100
-      shell: bash
diff --git a/.github/actions/upload-coverage/action.yml b/.github/actions/upload-coverage/action.yml
deleted file mode 100644
index f42fdf846325..000000000000
--- a/.github/actions/upload-coverage/action.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-name: Upload Coverage
-description: Upload coverage
-
-inputs:
-  name:
-    description: "Job name (must be unique within workflow)"
-    required: true
-
-runs:
-  using: "composite"
-
-  steps:
-    - run: coverage xml
-      shell: bash
-    - uses: actions/upload-artifact@v2
-      with:
-        name: coverage-${{ inputs.name }}
-        path: |
-            coverage.xml
-            rust-cov.lcov
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 629bc76762f2..74201efc73c2 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -116,8 +116,9 @@ jobs:
           TOXENV: ${{ matrix.PYTHON.TOXENV }}
           CARGO_TARGET_DIR: ${{ format('{0}/src/rust/target/', github.workspace) }}
 
-      - uses: ./.github/actions/upload-coverage
+      - uses: alex/github-actions-coverage-merge@main
         with:
+          mode: upload
           name: "tox -e ${{ matrix.PYTHON.TOXENV }} ${{ env.OSSL_INFO }}"
         if: matrix.PYTHON.COVERAGE != 'false'
 
@@ -170,8 +171,9 @@ jobs:
           TOXENV: ${{ matrix.IMAGE.TOXENV }}
           RUSTUP_HOME: /root/.rustup
           CARGO_TARGET_DIR: ${{ format('{0}/src/rust/target/', github.workspace) }}
-      - uses: ./.github/actions/upload-coverage
+      - uses: alex/github-actions-coverage-merge@main
         with:
+          mode: upload
           name: "${{ matrix.IMAGE.TOXENV }} on ${{ matrix.IMAGE.IMAGE }}"
 
   linux-rust:
@@ -224,8 +226,9 @@ jobs:
         env:
           TOXENV: ${{ matrix.PYTHON.TOXENV }}
           CARGO_TARGET_DIR: ${{ format('{0}/src/rust/target/', github.workspace) }}
-      - uses: ./.github/actions/upload-coverage
+      - uses: alex/github-actions-coverage-merge@main
         with:
+          mode: upload
           name: "${{ matrix.PYTHON.TOXENV }} with Rust ${{ matrix.RUST }}"
 
   linux-rust-coverage:
@@ -313,8 +316,9 @@ jobs:
             sed -E -i 's/SF:src\/(.*)/SF:src\/rust\/src\/\1/g' ../../pytest-rust-cov.lcov
             sed -E -i 's/SF:src\/(.*)/SF:src\/rust\/src\/\1/g' ../../cargo-test-rust-cov.lcov
 
-      - uses: ./.github/actions/upload-coverage
+      - uses: alex/github-actions-coverage-merge@main
         with:
+          mode: upload
           name: "Rust Coverage"
 
   macos:
@@ -378,8 +382,9 @@ jobs:
           EXTRA_CFLAGS: ${{ matrix.PYTHON.EXTRA_CFLAGS }}
           CARGO_TARGET_DIR: ${{ format('{0}/src/rust/target/', github.workspace) }}
 
-      - uses: ./.github/actions/upload-coverage
+      - uses: alex/github-actions-coverage-merge@main
         with:
+          mode: upload
           name: "${{ matrix.PYTHON.TOXENV }} on macOS"
 
   windows:
@@ -447,8 +452,9 @@ jobs:
           TOXENV: ${{ matrix.PYTHON.TOXENV }}
           CARGO_TARGET_DIR: ${{ format('{0}/src/rust/target/', github.workspace) }}
 
-      - uses: ./.github/actions/upload-coverage
+      - uses: alex/github-actions-coverage-merge@main
         with:
+          mode: upload
           name: "${{ matrix.PYTHON.TOXENV }} on ${{ matrix.WINDOWS.WINDOWS }} (part ${{ matrix.JOB_NUMBER }})"
 
   linux-downstream:
@@ -520,4 +526,6 @@ jobs:
     timeout-minutes: 10
     steps:
       - uses: actions/checkout@v2
-      - uses: ./.github/actions/merge-coverage
+      - uses: alex/github-actions-coverage-merge@main
+        with:
+          mode: merge

From c9f66ff3f02a32b142384f8b8aa128f343d6f344 Mon Sep 17 00:00:00 2001
From: Alex Gaynor <alex.gaynor@gmail.com>
Date: Sun, 18 Apr 2021 12:01:36 -0400
Subject: [PATCH 03/17] combo the coverage to remap paths

---
 .coveragerc | 1 +
 tox.ini     | 1 +
 2 files changed, 2 insertions(+)

diff --git a/.coveragerc b/.coveragerc
index ef820f0d4c6e..199ddbe89b65 100644
--- a/.coveragerc
+++ b/.coveragerc
@@ -1,4 +1,5 @@
 [run]
+parallel = True
 branch = True
 source =
     cryptography
diff --git a/tox.ini b/tox.ini
index 9fde3290a136..6e139a3d779f 100644
--- a/tox.ini
+++ b/tox.ini
@@ -14,6 +14,7 @@ passenv = ARCHFLAGS LDFLAGS CFLAGS INCLUDE LIB LD_LIBRARY_PATH USERNAME PYTHONIO
 commands =
     pip list
     pytest -n auto --cov=cryptography --cov=tests --capture=no --strict-markers --durations=10 {posargs} tests/
+    coverage combine
 
 # This target disables coverage on pypy because of performance problems with
 # coverage.py on pypy.

From 0d5d070d1d6a3d2a73b570a63ffbd3f46b491d61 Mon Sep 17 00:00:00 2001
From: Alex Gaynor <alex.gaynor@gmail.com>
Date: Sun, 18 Apr 2021 12:14:21 -0400
Subject: [PATCH 04/17] remove this?

---
 tox.ini | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tox.ini b/tox.ini
index 6e139a3d779f..9fde3290a136 100644
--- a/tox.ini
+++ b/tox.ini
@@ -14,7 +14,6 @@ passenv = ARCHFLAGS LDFLAGS CFLAGS INCLUDE LIB LD_LIBRARY_PATH USERNAME PYTHONIO
 commands =
     pip list
     pytest -n auto --cov=cryptography --cov=tests --capture=no --strict-markers --durations=10 {posargs} tests/
-    coverage combine
 
 # This target disables coverage on pypy because of performance problems with
 # coverage.py on pypy.

From aae6399b0f70b4c5b3d3961539747c00076451ae Mon Sep 17 00:00:00 2001
From: Alex Gaynor <alex.gaynor@gmail.com>
Date: Sun, 18 Apr 2021 14:34:45 -0400
Subject: [PATCH 05/17] This is maybe ok?

---
 .coveragerc | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.coveragerc b/.coveragerc
index 199ddbe89b65..75dfb3c1e96d 100644
--- a/.coveragerc
+++ b/.coveragerc
@@ -1,9 +1,6 @@
 [run]
 parallel = True
 branch = True
-source =
-    cryptography
-    tests/
 
 [paths]
 source =

From 830175c9612aabaccc02e65e60384af078d13245 Mon Sep 17 00:00:00 2001
From: Alex Gaynor <alex.gaynor@gmail.com>
Date: Sun, 18 Apr 2021 14:46:31 -0400
Subject: [PATCH 06/17] Revert "This is maybe ok?"

This reverts commit 1db9ade57d2aae55cfeea4c9c349599545532881.
---
 .coveragerc | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.coveragerc b/.coveragerc
index 75dfb3c1e96d..199ddbe89b65 100644
--- a/.coveragerc
+++ b/.coveragerc
@@ -1,6 +1,9 @@
 [run]
 parallel = True
 branch = True
+source =
+    cryptography
+    tests/
 
 [paths]
 source =

From fbbc847451b038aa29f0d7b11cee5247225d3d31 Mon Sep 17 00:00:00 2001
From: Alex Gaynor <alex.gaynor@gmail.com>
Date: Sun, 18 Apr 2021 14:53:10 -0400
Subject: [PATCH 07/17] Use coverage from my fork

---
 tox.ini | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tox.ini b/tox.ini
index 9fde3290a136..03a3866b8ffd 100644
--- a/tox.ini
+++ b/tox.ini
@@ -10,6 +10,7 @@ deps =
     -e ./vectors
     pytest-shard>=0.1.2
     randomorder: pytest-randomly
+    git+https://github.com/alex/coveragepy@patch-1
 passenv = ARCHFLAGS LDFLAGS CFLAGS INCLUDE LIB LD_LIBRARY_PATH USERNAME PYTHONIOENCODING RUSTFLAGS CARGO_TARGET_DIR LLVM_PROFILE_FILE OPENSSL_FORCE_FIPS_MODE
 commands =
     pip list

From 9eed99e5b9334290b54d723e99b479b72b8adf7b Mon Sep 17 00:00:00 2001
From: Alex Gaynor <alex.gaynor@gmail.com>
Date: Sun, 18 Apr 2021 21:33:38 -0400
Subject: [PATCH 08/17] Try uploading a raw file for reviewing

---
 .github/workflows/ci.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 74201efc73c2..878033b084f0 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -171,6 +171,10 @@ jobs:
           TOXENV: ${{ matrix.IMAGE.TOXENV }}
           RUSTUP_HOME: /root/.rustup
           CARGO_TARGET_DIR: ${{ format('{0}/src/rust/target/', github.workspace) }}
+      - uses: actions/upload-artifact@v2
+        with:
+          name: "raw-coverage-${{ matrix.IMAGE.TOXENV }} on ${{ matrix.IMAGE.IMAGE }}"
+          path: .coverage
       - uses: alex/github-actions-coverage-merge@main
         with:
           mode: upload

From 256a3d13f9cd9452b01aac2060b875d212532116 Mon Sep 17 00:00:00 2001
From: Alex Gaynor <alex.gaynor@gmail.com>
Date: Sun, 18 Apr 2021 21:58:47 -0400
Subject: [PATCH 09/17] FUCK

---
 .github/workflows/ci.yml | 10 +++++-----
 tox.ini                  |  1 -
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 878033b084f0..8c41ff46d5f5 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -76,7 +76,7 @@ jobs:
           repository: "google/wycheproof"
           path: "wycheproof"
           ref: "master"
-      - run: python -m pip install tox requests coverage
+      - run: python -m pip install tox requests git+https://github.com/alex/coveragepy@patch-1
       - name: Compute config hash and set config vars
         run: |
           DEFAULT_CONFIG_FLAGS="shared no-ssl2 no-ssl3"
@@ -223,7 +223,7 @@ jobs:
           repository: "google/wycheproof"
           path: "wycheproof"
           ref: "master"
-      - run: python -m pip install tox coverage
+      - run: python -m pip install tox git+https://github.com/alex/coveragepy@patch-1
       - name: Tests
         run: |
             tox -r --  --color=yes --wycheproof-root=wycheproof
@@ -282,7 +282,7 @@ jobs:
           repository: "google/wycheproof"
           path: "wycheproof"
           ref: "master"
-      - run: python -m pip install tox coverage
+      - run: python -m pip install tox git+https://github.com/alex/coveragepy@patch-1
       - name: Tests
         run: |
             tox -r --  --color=yes --wycheproof-root=wycheproof
@@ -362,7 +362,7 @@ jobs:
           override: true
           default: true
 
-      - run: python -m pip install tox requests coverage
+      - run: python -m pip install tox requests git+https://github.com/alex/coveragepy@patch-1
 
       - uses: actions/checkout@v2.3.4
         with:
@@ -435,7 +435,7 @@ jobs:
           default: true
           target: ${{ matrix.WINDOWS.RUST_TRIPLE }}
 
-      - run: python -m pip install tox requests coverage
+      - run: python -m pip install tox requests git+https://github.com/alex/coveragepy@patch-1
       - name: Download OpenSSL
         run: |
             python .github/workflows/download_openssl.py windows openssl-${{ matrix.WINDOWS.WINDOWS }}-${{ matrix.PYTHON.MSVC_VERSION }}
diff --git a/tox.ini b/tox.ini
index 03a3866b8ffd..9fde3290a136 100644
--- a/tox.ini
+++ b/tox.ini
@@ -10,7 +10,6 @@ deps =
     -e ./vectors
     pytest-shard>=0.1.2
     randomorder: pytest-randomly
-    git+https://github.com/alex/coveragepy@patch-1
 passenv = ARCHFLAGS LDFLAGS CFLAGS INCLUDE LIB LD_LIBRARY_PATH USERNAME PYTHONIOENCODING RUSTFLAGS CARGO_TARGET_DIR LLVM_PROFILE_FILE OPENSSL_FORCE_FIPS_MODE
 commands =
     pip list

From 5875eabc6a23644d09ada6207dad14d3c7031a52 Mon Sep 17 00:00:00 2001
From: Alex Gaynor <alex.gaynor@gmail.com>
Date: Sun, 18 Apr 2021 21:59:11 -0400
Subject: [PATCH 10/17] this is not needed

---
 .github/workflows/ci.yml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 8c41ff46d5f5..320e30edb1ea 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -171,10 +171,6 @@ jobs:
           TOXENV: ${{ matrix.IMAGE.TOXENV }}
           RUSTUP_HOME: /root/.rustup
           CARGO_TARGET_DIR: ${{ format('{0}/src/rust/target/', github.workspace) }}
-      - uses: actions/upload-artifact@v2
-        with:
-          name: "raw-coverage-${{ matrix.IMAGE.TOXENV }} on ${{ matrix.IMAGE.IMAGE }}"
-          path: .coverage
       - uses: alex/github-actions-coverage-merge@main
         with:
           mode: upload

From 5891eb4ab08d6b4ee8ad18cb622d073a96f09afd Mon Sep 17 00:00:00 2001
From: Alex Gaynor <alex.gaynor@gmail.com>
Date: Sun, 18 Apr 2021 22:59:15 -0400
Subject: [PATCH 11/17] Need this here too

---
 .github/workflows/ci.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 320e30edb1ea..cc4b7dc5a5fb 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -166,7 +166,8 @@ jobs:
           echo "OPENSSL_FORCE_FIPS_MODE=1" >> $GITHUB_ENV
           echo "CFLAGS=-DUSE_OSRANDOM_RNG_FOR_TESTING" >> $GITHUB_ENV
         if: matrix.IMAGE.FIPS
-      - run: 'tox -- --wycheproof-root="wycheproof"'
+      - run: pip install git+https://github.com/alex/coveragepy@patch-1
+      - run: 'tox -- --wycheproof-root="$HOME/wycheproof"'
         env:
           TOXENV: ${{ matrix.IMAGE.TOXENV }}
           RUSTUP_HOME: /root/.rustup

From aa1accfc8b454f2db83c9dd630c6dc8840a343c6 Mon Sep 17 00:00:00 2001
From: Alex Gaynor <alex.gaynor@gmail.com>
Date: Sun, 18 Apr 2021 23:47:49 -0400
Subject: [PATCH 12/17] Attempt magic

---
 .coveragerc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.coveragerc b/.coveragerc
index 199ddbe89b65..d8007afeee47 100644
--- a/.coveragerc
+++ b/.coveragerc
@@ -1,9 +1,9 @@
 [run]
 parallel = True
 branch = True
+relative_files = True
 source =
-    cryptography
-    tests/
+    .
 
 [paths]
 source =

From 6e9a68a491b3004118fcc7adc380dc7bb9d9354e Mon Sep 17 00:00:00 2001
From: Alex Gaynor <alex.gaynor@gmail.com>
Date: Sun, 18 Apr 2021 23:57:41 -0400
Subject: [PATCH 13/17] try this?

---
 .coveragerc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.coveragerc b/.coveragerc
index d8007afeee47..7d192d85d025 100644
--- a/.coveragerc
+++ b/.coveragerc
@@ -8,9 +8,9 @@ source =
 [paths]
 source =
    src/cryptography
-   .tox/*/lib*/python*/site-packages/cryptography
-   .tox\*\Lib\site-packages\cryptography
-   .tox/pypy/site-packages/cryptography
+   ./.tox/*/lib*/python*/site-packages/cryptography
+   ./.tox\*\Lib\site-packages\cryptography
+   ./.tox/pypy/site-packages/cryptography
 
 [report]
 exclude_lines =

From f37a86273cef425001c15b43b1fdda0744455baf Mon Sep 17 00:00:00 2001
From: Alex Gaynor <alex.gaynor@gmail.com>
Date: Mon, 19 Apr 2021 08:21:34 -0400
Subject: [PATCH 14/17] Revert "try this?"

This reverts commit 4d51e73383eb2855ae5e2f8b41239e0c2fb4ced7.
---
 .coveragerc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.coveragerc b/.coveragerc
index 7d192d85d025..d8007afeee47 100644
--- a/.coveragerc
+++ b/.coveragerc
@@ -8,9 +8,9 @@ source =
 [paths]
 source =
    src/cryptography
-   ./.tox/*/lib*/python*/site-packages/cryptography
-   ./.tox\*\Lib\site-packages\cryptography
-   ./.tox/pypy/site-packages/cryptography
+   .tox/*/lib*/python*/site-packages/cryptography
+   .tox\*\Lib\site-packages\cryptography
+   .tox/pypy/site-packages/cryptography
 
 [report]
 exclude_lines =

From cc9696de54310f9cd78486afbb6369d23b48f181 Mon Sep 17 00:00:00 2001
From: Alex Gaynor <alex.gaynor@gmail.com>
Date: Mon, 19 Apr 2021 08:31:59 -0400
Subject: [PATCH 15/17] Now we're just guessing...

---
 .coveragerc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.coveragerc b/.coveragerc
index d8007afeee47..2e55f5c04844 100644
--- a/.coveragerc
+++ b/.coveragerc
@@ -8,9 +8,9 @@ source =
 [paths]
 source =
    src/cryptography
-   .tox/*/lib*/python*/site-packages/cryptography
-   .tox\*\Lib\site-packages\cryptography
-   .tox/pypy/site-packages/cryptography
+   *.tox/*/lib*/python*/site-packages/cryptography
+   *.tox\*\Lib\site-packages\cryptography
+   *.tox/pypy/site-packages/cryptography
 
 [report]
 exclude_lines =

From b418c9bae9d782d7ea4118a84b9653a041b21c60 Mon Sep 17 00:00:00 2001
From: Alex Gaynor <alex.gaynor@gmail.com>
Date: Mon, 8 Nov 2021 19:58:22 -0500
Subject: [PATCH 16/17] whoops

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

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index cc4b7dc5a5fb..596150d72363 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -167,7 +167,7 @@ jobs:
           echo "CFLAGS=-DUSE_OSRANDOM_RNG_FOR_TESTING" >> $GITHUB_ENV
         if: matrix.IMAGE.FIPS
       - run: pip install git+https://github.com/alex/coveragepy@patch-1
-      - run: 'tox -- --wycheproof-root="$HOME/wycheproof"'
+      - run: 'tox -- --wycheproof-root="wycheproof"'
         env:
           TOXENV: ${{ matrix.IMAGE.TOXENV }}
           RUSTUP_HOME: /root/.rustup

From f41914c860a48a38991c548f65058ff04bf390d7 Mon Sep 17 00:00:00 2001
From: Alex Gaynor <alex.gaynor@gmail.com>
Date: Mon, 8 Nov 2021 20:13:36 -0500
Subject: [PATCH 17/17] disable coverage upload here temporarily

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

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 596150d72363..fc488e42558e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -42,7 +42,7 @@ jobs:
           - {VERSION: "3.9", TOXENV: "py39", OPENSSL: {TYPE: "libressl", VERSION: "3.4.1"}}
           - {VERSION: "3.10", TOXENV: "py310"}
           # Latest commit on the main-with-bazel branch, as of November 8, 2021
-          - {VERSION: "3.10", TOXENV: "backend-import", OPENSSL: {TYPE: "boringssl", VERSION: "4fb158925f7753d80fb858cb0239dff893ef9f15"}}
+          - {VERSION: "3.10", TOXENV: "backend-import", OPENSSL: {TYPE: "boringssl", VERSION: "4fb158925f7753d80fb858cb0239dff893ef9f15"}, COVERAGE: "false"}
         RUST:
           - stable
     name: "${{ matrix.PYTHON.TOXENV }} ${{ matrix.PYTHON.OPENSSL.TYPE }} ${{ matrix.PYTHON.OPENSSL.VERSION }} ${{ matrix.PYTHON.TOXARGS }} ${{ matrix.PYTHON.OPENSSL.CONFIG_FLAGS }}"