Home Explore Help
Sign In
cpp
/
panda3d
mirror of https://github.com/panda3d/panda3d
2
0
Fork 0
Files Issues 0 Wiki
Browse Source

workflow: Fix extraction of Python_EXECUTABLE from CMakeCache.txt

Also disable coverage testing for Python 2.7 and 3.5, since they are respectively EOL and do not use deterministic dictionary ordering.
rdb 5 years ago
parent
c185de3018
commit
980c6bb389
1 changed files with 7 additions and 9 deletions
Unified View Show Diff Stats
  1. 7 9
      .github/workflows/ci.yml

+ 7 - 9
.github/workflows/ci.yml
View File 

@@ -204,9 +204,8 @@ jobs:
 
       working-directory: build
 
       working-directory: build
 
       shell: bash
 
       shell: bash
 
       run: |
 
       run: |
 
-        PYTHON_EXECUTABLE=$(grep 'Python_EXECUTABLE:FILEPATH' CMakeCache.txt | sed 's/.*=//')
 
-        $PYTHON_EXECUTABLE -m pip install pytest pytest-cov
 
-        export COVERAGE_FILE=.coverage.$RANDOM LLVM_PROFILE_FILE=$PWD/pid-%p.profraw
 
+        PYTHON_EXECUTABLE=$(grep '_Python_EXECUTABLE:INTERNAL' CMakeCache.txt | sed 's/.*=//')
 
+        $PYTHON_EXECUTABLE -m pip install pytest
 
         ctest -V -C ${{ matrix.config }}
 
         ctest -V -C ${{ matrix.config }}
 
       # END B
 
       # END B
 
 
 
@@ -234,9 +233,8 @@ jobs:
 
       working-directory: build
 
       working-directory: build
 
       shell: bash
 
       shell: bash
 
       run: |
 
       run: |
 
-        PYTHON_EXECUTABLE=$(grep 'Python_EXECUTABLE:FILEPATH' CMakeCache.txt | sed 's/.*=//')
 
-        $PYTHON_EXECUTABLE -m pip install pytest pytest-cov
 
-        export COVERAGE_FILE=.coverage.$RANDOM LLVM_PROFILE_FILE=$PWD/pid-%p.profraw
 
+        PYTHON_EXECUTABLE=$(grep '_Python_EXECUTABLE:INTERNAL' CMakeCache.txt | sed 's/.*=//')
 
+        $PYTHON_EXECUTABLE -m pip install pytest
 
         ctest -V -C ${{ matrix.config }}
 
         ctest -V -C ${{ matrix.config }}
 
       # END B
 
       # END B
 
 
 
@@ -264,7 +262,7 @@ jobs:
 
       working-directory: build
 
       working-directory: build
 
       shell: bash
 
       shell: bash
 
       run: |
 
       run: |
 
-        PYTHON_EXECUTABLE=$(grep 'Python_EXECUTABLE:FILEPATH' CMakeCache.txt | sed 's/.*=//')
 
+        PYTHON_EXECUTABLE=$(grep '_Python_EXECUTABLE:INTERNAL' CMakeCache.txt | sed 's/.*=//')
 
         $PYTHON_EXECUTABLE -m pip install pytest pytest-cov
 
         $PYTHON_EXECUTABLE -m pip install pytest pytest-cov
 
         export COVERAGE_FILE=.coverage.$RANDOM LLVM_PROFILE_FILE=$PWD/pid-%p.profraw
 
         export COVERAGE_FILE=.coverage.$RANDOM LLVM_PROFILE_FILE=$PWD/pid-%p.profraw
 
         ctest -V -C ${{ matrix.config }}
 
         ctest -V -C ${{ matrix.config }}
 
@@ -294,7 +292,7 @@ jobs:
 
       working-directory: build
 
       working-directory: build
 
       shell: bash
 
       shell: bash
 
       run: |
 
       run: |
 
-        PYTHON_EXECUTABLE=$(grep 'Python_EXECUTABLE:FILEPATH' CMakeCache.txt | sed 's/.*=//')
 
+        PYTHON_EXECUTABLE=$(grep '_Python_EXECUTABLE:INTERNAL' CMakeCache.txt | sed 's/.*=//')
 
         $PYTHON_EXECUTABLE -m pip install pytest pytest-cov
 
         $PYTHON_EXECUTABLE -m pip install pytest pytest-cov
 
         export COVERAGE_FILE=.coverage.$RANDOM LLVM_PROFILE_FILE=$PWD/pid-%p.profraw
 
         export COVERAGE_FILE=.coverage.$RANDOM LLVM_PROFILE_FILE=$PWD/pid-%p.profraw
 
         ctest -V -C ${{ matrix.config }}
 
         ctest -V -C ${{ matrix.config }}
 
@@ -324,7 +322,7 @@ jobs:
 
       working-directory: build
 
       working-directory: build
 
       shell: bash
 
       shell: bash
 
       run: |
 
       run: |
 
-        PYTHON_EXECUTABLE=$(grep 'Python_EXECUTABLE:FILEPATH' CMakeCache.txt | sed 's/.*=//')
 
+        PYTHON_EXECUTABLE=$(grep '_Python_EXECUTABLE:INTERNAL' CMakeCache.txt | sed 's/.*=//')
 
         $PYTHON_EXECUTABLE -m pip install pytest pytest-cov
 
         $PYTHON_EXECUTABLE -m pip install pytest pytest-cov
 
         export COVERAGE_FILE=.coverage.$RANDOM LLVM_PROFILE_FILE=$PWD/pid-%p.profraw
 
         export COVERAGE_FILE=.coverage.$RANDOM LLVM_PROFILE_FILE=$PWD/pid-%p.profraw
 
         ctest -V -C ${{ matrix.config }}
 
         ctest -V -C ${{ matrix.config }}