From c860191a1ac9b0212186828faa9aa3e50257f8a9 Mon Sep 17 00:00:00 2001 From: David Verdeguer Date: Mon, 19 Oct 2020 12:21:04 +0200 Subject: [PATCH 1/7] Run python deps tests on mac --- .../{python-deps-linux.yml => python-deps.yml} | 13 ++++++++++--- python-setup/install_tools.sh | 3 --- 2 files changed, 10 insertions(+), 6 deletions(-) rename .github/workflows/{python-deps-linux.yml => python-deps.yml} (83%) diff --git a/.github/workflows/python-deps-linux.yml b/.github/workflows/python-deps.yml similarity index 83% rename from .github/workflows/python-deps-linux.yml rename to .github/workflows/python-deps.yml index 0ec27f7e7..f7a35eeeb 100644 --- a/.github/workflows/python-deps-linux.yml +++ b/.github/workflows/python-deps.yml @@ -1,4 +1,4 @@ -name: Test Python Package Installation on Linux +name: Test Python Package Installation on Linux and Mac on: push: @@ -8,10 +8,11 @@ on: jobs: test-setup-python-scripts: - runs-on: ubuntu-latest + runs-on: ${{ matrix.os }} strategy: fail-fast: false matrix: + os: [ubuntu-latest, macos-latest] include: - test_dir: python-setup/tests/pipenv/requests-2 test_script: $GITHUB_WORKSPACE/python-setup/tests/check_requests_123.sh 2 @@ -52,7 +53,13 @@ jobs: $GITHUB_WORKSPACE/python-setup/install_tools.sh echo -e '\n\n\n\n\n' && sleep 0.5 cd $GITHUB_WORKSPACE/${{ matrix.test_dir }} - find /opt/hostedtoolcache/CodeQL -path "*x64/codeql" -exec $GITHUB_WORKSPACE/python-setup/auto_install_packages.py {} \; + unameOut="$(uname -s)" + case "${unameOut}" in + Linux*) basePath="/opt";; + Darwin*) basePath="/Users/runner";; + esac + echo ${basePath} + find ${basePath}/hostedtoolcache/CodeQL -path "*x64/codeql" -exec $GITHUB_WORKSPACE/python-setup/auto_install_packages.py {} \; - name: Setup for extractor run: | echo $CODEQL_PYTHON diff --git a/python-setup/install_tools.sh b/python-setup/install_tools.sh index 5179a5c24..b5a6e8dce 100755 --- a/python-setup/install_tools.sh +++ b/python-setup/install_tools.sh @@ -18,9 +18,6 @@ python3 -m pip install --user --upgrade pip setuptools wheel python2 -m pip install --user virtualenv python3 -m pip install --user virtualenv -# venv is required for installation of poetry or pipenv (I forgot which) -sudo apt-get install -y python3-venv - # We install poetry with pip instead of the recommended way, since the recommended way # caused some problem since `poetry run` gives output like: # From 8e516b1d364e219d23b41ed6e20056ccfd2f9d61 Mon Sep 17 00:00:00 2001 From: David Verdeguer Date: Mon, 19 Oct 2020 12:21:58 +0200 Subject: [PATCH 2/7] Run tests --- .github/workflows/python-deps.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/python-deps.yml b/.github/workflows/python-deps.yml index f7a35eeeb..f1145af45 100644 --- a/.github/workflows/python-deps.yml +++ b/.github/workflows/python-deps.yml @@ -2,7 +2,6 @@ name: Test Python Package Installation on Linux and Mac on: push: - branches: [main, v1] pull_request: jobs: From 04f2f600bc4a8325adc41f4333851a1a4cadf668 Mon Sep 17 00:00:00 2001 From: David Verdeguer Date: Mon, 19 Oct 2020 12:31:18 +0200 Subject: [PATCH 3/7] Adapt true for mac --- .github/workflows/python-deps.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/python-deps.yml b/.github/workflows/python-deps.yml index f1145af45..18391d005 100644 --- a/.github/workflows/python-deps.yml +++ b/.github/workflows/python-deps.yml @@ -62,8 +62,13 @@ jobs: - name: Setup for extractor run: | echo $CODEQL_PYTHON + unameOut="$(uname -s)" + case "${true}" in + Linux*) true="/bin/true";; + Darwin*) true="/usr/bin/true";; + esac # only run if $CODEQL_PYTHON is set - test ! -z $CODEQL_PYTHON && $GITHUB_WORKSPACE/python-setup/tests/from_python_exe.py $CODEQL_PYTHON || /bin/true + test ! -z $CODEQL_PYTHON && $GITHUB_WORKSPACE/python-setup/tests/from_python_exe.py $CODEQL_PYTHON || ${true} - name: Verify packages installed run: | ${{ matrix.test_script }} \ No newline at end of file From 2391771a3f9b3a4cb453609640d1936251c63edc Mon Sep 17 00:00:00 2001 From: David Verdeguer Date: Mon, 19 Oct 2020 12:45:33 +0200 Subject: [PATCH 4/7] Allow installing python deps on mac --- lib/init.js | 5 ----- lib/init.js.map | 2 +- src/init.ts | 8 -------- 3 files changed, 1 insertion(+), 14 deletions(-) diff --git a/lib/init.js b/lib/init.js index 4b1d15632..0e6941eeb 100644 --- a/lib/init.js +++ b/lib/init.js @@ -123,11 +123,6 @@ async function injectWindowsTracer(processName, processLevel, config, codeql, tr exports.injectWindowsTracer = injectWindowsTracer; async function installPythonDeps(codeql, logger) { logger.startGroup("Setup Python dependencies"); - if (process.platform === "darwin") { - logger.info("Currently, auto-installing python dependencies is not supported on MacOS"); - logger.endGroup(); - return; - } const scriptsFolder = path.resolve(__dirname, "../python-setup"); // Setup tools on the Github hosted runners if (process.env["ImageOS"] !== undefined) { diff --git a/lib/init.js.map b/lib/init.js.map index 277b31665..2ddcec68a 100644 --- a/lib/init.js.map +++ b/lib/init.js.map @@ -1 +1 @@ -{"version":3,"file":"init.js","sourceRoot":"","sources":["../src/init.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"init.js","sourceRoot":"","sources":["../src/init.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/src/init.ts b/src/init.ts index 0fbd8a404..9f2d47c7e 100644 --- a/src/init.ts +++ b/src/init.ts @@ -186,14 +186,6 @@ export async function injectWindowsTracer( export async function installPythonDeps(codeql: CodeQL, logger: Logger) { logger.startGroup("Setup Python dependencies"); - if (process.platform === "darwin") { - logger.info( - "Currently, auto-installing python dependencies is not supported on MacOS" - ); - logger.endGroup(); - return; - } - const scriptsFolder = path.resolve(__dirname, "../python-setup"); // Setup tools on the Github hosted runners From ce8418a2ed679a1856c46a273ba9ab6c0a4b2f8e Mon Sep 17 00:00:00 2001 From: David Verdeguer Date: Mon, 19 Oct 2020 13:08:20 +0200 Subject: [PATCH 5/7] Only run tests on main and v1 --- .github/workflows/python-deps.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/python-deps.yml b/.github/workflows/python-deps.yml index 18391d005..0923d3305 100644 --- a/.github/workflows/python-deps.yml +++ b/.github/workflows/python-deps.yml @@ -2,6 +2,7 @@ name: Test Python Package Installation on Linux and Mac on: push: + branches: [main, v1] pull_request: jobs: From 1c789715a7a8452ba12698eee93022537b7c4abe Mon Sep 17 00:00:00 2001 From: David Verdeguer Date: Tue, 20 Oct 2020 10:49:48 +0200 Subject: [PATCH 6/7] Address comments --- .github/workflows/python-deps.yml | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/.github/workflows/python-deps.yml b/.github/workflows/python-deps.yml index 0923d3305..25c32bccd 100644 --- a/.github/workflows/python-deps.yml +++ b/.github/workflows/python-deps.yml @@ -51,25 +51,23 @@ jobs: run: | set -x $GITHUB_WORKSPACE/python-setup/install_tools.sh - echo -e '\n\n\n\n\n' && sleep 0.5 + cd $GITHUB_WORKSPACE/${{ matrix.test_dir }} - unameOut="$(uname -s)" - case "${unameOut}" in - Linux*) basePath="/opt";; - Darwin*) basePath="/Users/runner";; + + case ${{ matrix.os }} in + ubuntu-latest*) basePath="/opt";; + macos-latest*) basePath="/Users/runner";; esac echo ${basePath} + find ${basePath}/hostedtoolcache/CodeQL -path "*x64/codeql" -exec $GITHUB_WORKSPACE/python-setup/auto_install_packages.py {} \; - name: Setup for extractor run: | echo $CODEQL_PYTHON - unameOut="$(uname -s)" - case "${true}" in - Linux*) true="/bin/true";; - Darwin*) true="/usr/bin/true";; - esac # only run if $CODEQL_PYTHON is set - test ! -z $CODEQL_PYTHON && $GITHUB_WORKSPACE/python-setup/tests/from_python_exe.py $CODEQL_PYTHON || ${true} + if [ ! -z $CODEQL_PYTHON ]; then + $GITHUB_WORKSPACE/python-setup/tests/from_python_exe.py $CODEQL_PYTHON; + fi - name: Verify packages installed run: | ${{ matrix.test_script }} \ No newline at end of file From bf20a55f26e3de81d8cbb908e3a407f5ec4b2fe5 Mon Sep 17 00:00:00 2001 From: David Verdeguer Date: Thu, 22 Oct 2020 14:00:51 +0200 Subject: [PATCH 7/7] Combine python deps tests workflows --- .github/workflows/python-deps-windows.yml | 61 ----------------------- .github/workflows/python-deps.yml | 54 +++++++++++++++++++- 2 files changed, 53 insertions(+), 62 deletions(-) delete mode 100644 .github/workflows/python-deps-windows.yml diff --git a/.github/workflows/python-deps-windows.yml b/.github/workflows/python-deps-windows.yml deleted file mode 100644 index 5de085adb..000000000 --- a/.github/workflows/python-deps-windows.yml +++ /dev/null @@ -1,61 +0,0 @@ -name: Test Python Package Installation on Windows - - -on: - push: - branches: [main, v1] - pull_request: - -jobs: - - test-setup-python-scripts: - runs-on: windows-latest - strategy: - fail-fast: false - matrix: - include: - - test_dir: python-setup/tests/pipenv/requests-2 - python_version: 2 - - test_dir: python-setup/tests/pipenv/requests-3 - python_version: 3 - - - test_dir: python-setup/tests/poetry/requests-2 - python_version: 2 - - test_dir: python-setup/tests/poetry/requests-3 - python_version: 3 - - - test_dir: python-setup/tests/requirements/requests-2 - python_version: 2 - - test_dir: python-setup/tests/requirements/requests-3 - python_version: 3 - - - test_dir: python-setup/tests/setup_py/requests-2 - python_version: 2 - - test_dir: python-setup/tests/setup_py/requests-3 - python_version: 3 - - steps: - # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - - uses: actions/checkout@v2 - - - name: Initialize CodeQL - uses: github/codeql-action/init@v1 - with: - languages: python - - - name: Test Auto Package Installation - run: | - $cmd = $Env:GITHUB_WORKSPACE + "\\python-setup\\install_tools.ps1" - powershell -File $cmd - - cd $Env:GITHUB_WORKSPACE\\${{ matrix.test_dir }} - py -3 $Env:GITHUB_WORKSPACE\\python-setup\\auto_install_packages.py C:\\hostedtoolcache\\windows\\CodeQL\\0.0.0-20200826\\x64\\codeql - - name: Setup for extractor - run: | - echo $Env:CODEQL_PYTHON - - py -3 $Env:GITHUB_WORKSPACE\\python-setup\\tests\\from_python_exe.py $Env:CODEQL_PYTHON - - name: Verify packages installed - run: | - $cmd = $Env:GITHUB_WORKSPACE + "\\python-setup\\tests\\check_requests_123.ps1" - powershell -File $cmd ${{ matrix.python_version }} \ No newline at end of file diff --git a/.github/workflows/python-deps.yml b/.github/workflows/python-deps.yml index 25c32bccd..a9b014449 100644 --- a/.github/workflows/python-deps.yml +++ b/.github/workflows/python-deps.yml @@ -70,4 +70,56 @@ jobs: fi - name: Verify packages installed run: | - ${{ matrix.test_script }} \ No newline at end of file + ${{ matrix.test_script }} + + test-setup-python-scripts-windows: + runs-on: windows-latest + strategy: + fail-fast: false + matrix: + include: + - test_dir: python-setup/tests/pipenv/requests-2 + python_version: 2 + - test_dir: python-setup/tests/pipenv/requests-3 + python_version: 3 + + - test_dir: python-setup/tests/poetry/requests-2 + python_version: 2 + - test_dir: python-setup/tests/poetry/requests-3 + python_version: 3 + + - test_dir: python-setup/tests/requirements/requests-2 + python_version: 2 + - test_dir: python-setup/tests/requirements/requests-3 + python_version: 3 + + - test_dir: python-setup/tests/setup_py/requests-2 + python_version: 2 + - test_dir: python-setup/tests/setup_py/requests-3 + python_version: 3 + + steps: + # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it + - uses: actions/checkout@v2 + + - name: Initialize CodeQL + uses: github/codeql-action/init@v1 + with: + languages: python + + - name: Test Auto Package Installation + run: | + $cmd = $Env:GITHUB_WORKSPACE + "\\python-setup\\install_tools.ps1" + powershell -File $cmd + + cd $Env:GITHUB_WORKSPACE\\${{ matrix.test_dir }} + py -3 $Env:GITHUB_WORKSPACE\\python-setup\\auto_install_packages.py C:\\hostedtoolcache\\windows\\CodeQL\\0.0.0-20200826\\x64\\codeql + - name: Setup for extractor + run: | + echo $Env:CODEQL_PYTHON + + py -3 $Env:GITHUB_WORKSPACE\\python-setup\\tests\\from_python_exe.py $Env:CODEQL_PYTHON + - name: Verify packages installed + run: | + $cmd = $Env:GITHUB_WORKSPACE + "\\python-setup\\tests\\check_requests_123.ps1" + powershell -File $cmd ${{ matrix.python_version }} \ No newline at end of file