Merge pull request #556 from neerdoc/Simplify_CI

Simplify CI
doorstop-dev · Mar 7, 2022 · 6ede2ee · 6ede2ee
2 parents b14c66d + fe72d40
commit 6ede2ee
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 10 deletions.
diff --git a/.github/workflows/execute-tests.yml b/.github/workflows/execute-tests.yml
@@ -2,9 +2,6 @@ name: Execute tests
 on:
   workflow_call:
     inputs:
-      architecture:
-        required: true
-        type: string
       basepath:
         required: true
         type: string
@@ -46,7 +43,7 @@ jobs:
       - uses: actions/setup-python@v2
         with:
           python-version: ${{ matrix.python-version }}
-          architecture: ${{ inputs.architecture }}
+          architecture: x64
 
       - uses: Gr1N/setup-poetry@v7
 
@@ -66,7 +63,7 @@ jobs:
 
       - name: Upload coverage
         uses: codecov/codecov-action@v1
-        if: ${{ inputs.os == 'ubuntu-latest' }}
+        if: ${{ inputs.os == 'ubuntu-latest' && matrix.python-version == '3.9' && github.repository == 'doorstop-dev/doorstop' }}
         with:
           fail_ci_if_error: true
 

diff --git a/.github/workflows/test-linux.yml b/.github/workflows/test-linux.yml
@@ -6,7 +6,6 @@ jobs:
   Test:
     uses: ./.github/workflows/execute-tests.yml
     with:
-      architecture: x64
       basepath: "/home/runner/work"
       os: "ubuntu-latest"
       workpath: "/home/runner/work/doorstop/doorstop"
diff --git a/.github/workflows/test-osx.yml b/.github/workflows/test-osx.yml
@@ -6,7 +6,6 @@ jobs:
   Test:
     uses: ./.github/workflows/execute-tests.yml
     with:
-      architecture: x64
       basepath: "/Users/runner/work"
       os: "macos-latest"
       workpath: "/Users/runner/work/doorstop/doorstop"
diff --git a/.github/workflows/test-windows.yml b/.github/workflows/test-windows.yml
@@ -3,12 +3,9 @@ name: Windows
 on: push
 
 jobs:
-
-
   Test:
     uses: ./.github/workflows/execute-tests.yml
     with:
-      architecture: x64
       basepath: 'D:\'
       os: "windows-latest"
       workpath: 'C:\a\doorstop\doorstop'