Amalgamate CI workflow job for Ubuntu runner with others

Author: alexdewar

.github/actions/codecov/action.yml

@@ -0,0 +1,23 @@
+name: Code coverage
+description: Generate code coverage and upload to codecov
+inputs:
+  token:
+    description: Codecov token
+    required: true
+
+runs:
+  using: composite
+  steps:
+    - name: Install cargo-llvm-cov
+      shell: bash
+      run: cargo install cargo-llvm-cov
+
+    - name: Generate code coverage
+      shell: bash
+      run: cargo llvm-cov --codecov --output-path codecov.json
+
+    - name: Upload to codecov.io
+      uses: codecov/codecov-action@v5
+      with:
+        token: ${{ inputs.token }}
+        fail_ci_if_error: true

.github/workflows/cargo-build-and-test.yml

@@ -9,44 +9,14 @@ env:
   CARGO_TERM_COLOR: always
 
 jobs:
-  coverage:
-    name: Build and test with coverage
-    runs-on: ubuntu-latest
-    # Longer timeout because this job involves more steps
-    timeout-minutes: 20
-    env:
-      # Make warnings fatal
-      RUSTDOCFLAGS: -D warnings
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-
-      - uses: actions-rust-lang/setup-rust-toolchain@v1
-        with:
-          toolchain: stable
-      - run: cargo test --verbose
-
-      - name: Install cargo-llvm-cov
-        run: cargo install cargo-llvm-cov
-
-      - name: Generate code coverage
-        run: |
-          cargo llvm-cov --codecov --output-path codecov.json
-
-      - name: Upload to codecov.io
-        uses: codecov/codecov-action@v5
-        with:
-          token: ${{ secrets.CODECOV_TOKEN }}
-          fail_ci_if_error: true
-
   build_and_test:
     name: Build and test
     runs-on: ${{ matrix.os }}
     timeout-minutes: 15
     strategy:
       fail-fast: false
       matrix:
-        os: [windows-latest, macos-latest]
+        os: [ubuntu-latest, windows-latest, macos-latest]
         toolchain:
           - stable
     steps:
@@ -55,3 +25,8 @@ jobs:
         with:
           toolchain: ${{ matrix.toolchain }}
       - run: cargo test --verbose
+
+      - if: ${{ matrix.os == 'ubuntu-latest' }}
+        uses: ./.github/actions/codecov
+        with:
+          token: ${{ secrets.CODECOV_TOKEN }}