Skip to content

Commit c860191

Browse files
committed
Run python deps tests on mac
1 parent c8b8c04 commit c860191

2 files changed

Lines changed: 10 additions & 6 deletions

File tree

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Test Python Package Installation on Linux
1+
name: Test Python Package Installation on Linux and Mac
22

33
on:
44
push:
@@ -8,10 +8,11 @@ on:
88
jobs:
99

1010
test-setup-python-scripts:
11-
runs-on: ubuntu-latest
11+
runs-on: ${{ matrix.os }}
1212
strategy:
1313
fail-fast: false
1414
matrix:
15+
os: [ubuntu-latest, macos-latest]
1516
include:
1617
- test_dir: python-setup/tests/pipenv/requests-2
1718
test_script: $GITHUB_WORKSPACE/python-setup/tests/check_requests_123.sh 2
@@ -52,7 +53,13 @@ jobs:
5253
$GITHUB_WORKSPACE/python-setup/install_tools.sh
5354
echo -e '\n\n\n\n\n' && sleep 0.5
5455
cd $GITHUB_WORKSPACE/${{ matrix.test_dir }}
55-
find /opt/hostedtoolcache/CodeQL -path "*x64/codeql" -exec $GITHUB_WORKSPACE/python-setup/auto_install_packages.py {} \;
56+
unameOut="$(uname -s)"
57+
case "${unameOut}" in
58+
Linux*) basePath="/opt";;
59+
Darwin*) basePath="/Users/runner";;
60+
esac
61+
echo ${basePath}
62+
find ${basePath}/hostedtoolcache/CodeQL -path "*x64/codeql" -exec $GITHUB_WORKSPACE/python-setup/auto_install_packages.py {} \;
5663
- name: Setup for extractor
5764
run: |
5865
echo $CODEQL_PYTHON

python-setup/install_tools.sh

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,6 @@ python3 -m pip install --user --upgrade pip setuptools wheel
1818
python2 -m pip install --user virtualenv
1919
python3 -m pip install --user virtualenv
2020

21-
# venv is required for installation of poetry or pipenv (I forgot which)
22-
sudo apt-get install -y python3-venv
23-
2421
# We install poetry with pip instead of the recommended way, since the recommended way
2522
# caused some problem since `poetry run` gives output like:
2623
#

0 commit comments

Comments
 (0)