fixup

Signed-off-by: Tsuyoshi Hombashi <[email protected]>
thombashi · Jan 1, 2025 · 6424a3a · 6424a3a
1 parent 093aa6f
commit 6424a3a
Showing 1 changed file with 99 additions and 75 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -88,88 +88,112 @@ jobs:
       - run: make setup-ci
 
       - name: Run tests
-        run: tox -e py
-
-  run-coverage:
-    runs-on: ${{ matrix.os }}
-    strategy:
-      fail-fast: false
-      matrix:
-        python-version: ["3.13"]
-        os: [ubuntu-latest, macos-latest, windows-latest]
-    timeout-minutes: 20
-    defaults:
-      run:
-        shell: bash
-
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Setup Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v5
-        with:
-          python-version: ${{ matrix.python-version }}
-          cache: pip
-          cache-dependency-path: |
-            setup.py
-            **/*requirements.txt
-            tox.ini
-
-      - name: Setup env
-        id: env
-        run: |
-          echo "COVERAGE_FILE=.coverage_${{ matrix.os }}_${{ matrix.python-version }} " >> $GITHUB_ENV
-          echo "coverage-file=$COVERAGE_FILE" >> $GITHUB_OUTPUT
-
-      - run: make setup-ci
-
-      - name: Run tests
-        env:
-          PYTEST_DISCORD_WEBHOOK: ${{ secrets.PYTEST_DISCORD_WEBHOOK }}
         run: tox -e cov
 
-      - run: ls -a
+      - name: Install coveralls
+        run: python -m pip install --upgrade --disable-pip-version-check coveralls tomli
 
-      - uses: actions/upload-artifact@v4
-        with:
-          name: cov_${{ matrix.os }}_${{ matrix.python-version }}
-          include-hidden-files: true
-          path: .coverage_*
+      - name: Upload coverage data to coveralls.io
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          COVERALLS_FLAG_NAME: ${{ matrix.os }}-${{ matrix.python-version }}
+          COVERALLS_PARALLEL: true
+        run: coveralls
 
-  upload-coverage:
-    needs: run-coverage
+  coveralls:
+    name: Indicate completion to coveralls.io
+    needs: unit-test
     runs-on: ubuntu-latest
-    timeout-minutes: 20
+    container: python:3-slim
 
     steps:
-      - uses: actions/checkout@v4
-
-      - uses: actions/download-artifact@v4
-        with:
-          pattern: cov_*
-          merge-multiple: true
-          path: artifact
-
-      - name: List
-        working-directory: artifact
-        run: |
-          set -x
-
-          pwd
-          ls -alR
-
-      - name: Install packages
-        run: python -m pip install --upgrade --disable-pip-version-check coveralls tomli
-
-      - name: Combine coverage reports
-        run: |
-          coverage combine artifact/.coverage_*
-          ls -alR
-
-      - name: Upload coverage report
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: coveralls --service=github
+    - run: pip3 install --upgrade coveralls
+
+    - name: Finished
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      run: coveralls --finish
+
+  # run-coverage:
+  #   runs-on: ${{ matrix.os }}
+  #   strategy:
+  #     fail-fast: false
+  #     matrix:
+  #       python-version: ["3.13"]
+  #       os: [ubuntu-latest, macos-latest, windows-latest]
+  #   timeout-minutes: 20
+  #   defaults:
+  #     run:
+  #       shell: bash
+
+  #   steps:
+  #     - uses: actions/checkout@v4
+
+  #     - name: Setup Python ${{ matrix.python-version }}
+  #       uses: actions/setup-python@v5
+  #       with:
+  #         python-version: ${{ matrix.python-version }}
+  #         cache: pip
+  #         cache-dependency-path: |
+  #           setup.py
+  #           **/*requirements.txt
+  #           tox.ini
+
+  #     - name: Setup env
+  #       id: env
+  #       run: |
+  #         echo "COVERAGE_FILE=.coverage_${{ matrix.os }}_${{ matrix.python-version }} " >> $GITHUB_ENV
+  #         echo "coverage-file=$COVERAGE_FILE" >> $GITHUB_OUTPUT
+
+  #     - run: make setup-ci
+
+  #     - name: Run tests
+  #       env:
+  #         PYTEST_DISCORD_WEBHOOK: ${{ secrets.PYTEST_DISCORD_WEBHOOK }}
+  #       run: tox -e cov
+
+  #     - run: ls -a
+
+  #     - uses: actions/upload-artifact@v4
+  #       with:
+  #         name: cov_${{ matrix.os }}_${{ matrix.python-version }}
+  #         include-hidden-files: true
+  #         path: .coverage_*
+
+  # upload-coverage:
+  #   needs: run-coverage
+  #   runs-on: ubuntu-latest
+  #   timeout-minutes: 20
+
+  #   steps:
+  #     - uses: actions/checkout@v4
+
+  #     - uses: actions/download-artifact@v4
+  #       with:
+  #         pattern: cov_*
+  #         merge-multiple: true
+  #         path: artifact
+
+  #     - name: List
+  #       working-directory: artifact
+  #       run: |
+  #         set -x
+
+  #         pwd
+  #         ls -alR
+
+  #     - name: Install packages
+  #       run: python -m pip install --upgrade --disable-pip-version-check coveralls tomli
+
+  #     - name: Combine coverage reports
+  #       run: |
+  #         coverage combine artifact/.coverage_*
+  #         ls -alR
+
+  #     - name: Upload coverage report
+  #       env:
+  #         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+  #       run: coveralls --service=github
 
   run-sample:
     runs-on: ubuntu-latest