Skip to content

Commit 1c78971

Browse files
committed
Address comments
1 parent ce8418a commit 1c78971

1 file changed

Lines changed: 9 additions & 11 deletions

File tree

.github/workflows/python-deps.yml

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -51,25 +51,23 @@ jobs:
5151
run: |
5252
set -x
5353
$GITHUB_WORKSPACE/python-setup/install_tools.sh
54-
echo -e '\n\n\n\n\n' && sleep 0.5
54+
5555
cd $GITHUB_WORKSPACE/${{ matrix.test_dir }}
56-
unameOut="$(uname -s)"
57-
case "${unameOut}" in
58-
Linux*) basePath="/opt";;
59-
Darwin*) basePath="/Users/runner";;
56+
57+
case ${{ matrix.os }} in
58+
ubuntu-latest*) basePath="/opt";;
59+
macos-latest*) basePath="/Users/runner";;
6060
esac
6161
echo ${basePath}
62+
6263
find ${basePath}/hostedtoolcache/CodeQL -path "*x64/codeql" -exec $GITHUB_WORKSPACE/python-setup/auto_install_packages.py {} \;
6364
- name: Setup for extractor
6465
run: |
6566
echo $CODEQL_PYTHON
66-
unameOut="$(uname -s)"
67-
case "${true}" in
68-
Linux*) true="/bin/true";;
69-
Darwin*) true="/usr/bin/true";;
70-
esac
7167
# only run if $CODEQL_PYTHON is set
72-
test ! -z $CODEQL_PYTHON && $GITHUB_WORKSPACE/python-setup/tests/from_python_exe.py $CODEQL_PYTHON || ${true}
68+
if [ ! -z $CODEQL_PYTHON ]; then
69+
$GITHUB_WORKSPACE/python-setup/tests/from_python_exe.py $CODEQL_PYTHON;
70+
fi
7371
- name: Verify packages installed
7472
run: |
7573
${{ matrix.test_script }}

0 commit comments

Comments
 (0)