Skip to content

Commit

Permalink
Merge pull request #1502 from github/henrymercer/python-packages-use-…
Browse files Browse the repository at this point in the history
…path-from-action

Use CodeQL path from `init` Action in Windows Python dependencies PR checks
  • Loading branch information
henrymercer committed Jan 23, 2023
2 parents 421a1b3 + 64580b3 commit 5794d96
Showing 1 changed file with 6 additions and 5 deletions.
11 changes: 6 additions & 5 deletions .github/workflows/python-deps.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Test Python Package Installation on Linux and Mac
name: Test Python Package Installation

on:
push:
Expand Down Expand Up @@ -144,22 +144,23 @@ jobs:
python-version: ${{ matrix.python_version }}

- name: Initialize CodeQL
id: init
uses: ./init
with:
tools: latest
languages: python
setup-python-dependencies: false

- name: Test Auto Package Installation
env:
CODEQL_PATH: ${{ steps.init.outputs.codeql-path }}
run: |
$cmd = $Env:GITHUB_WORKSPACE + "\\python-setup\\install_tools.ps1"
powershell -File $cmd
cd $Env:GITHUB_WORKSPACE\\python-setup/tests/$Env:PYTHON_DEPS_TYPE/requests-$Env:PYTHON_VERSION
$DefaultsPath = Join-Path (Join-Path $Env:GITHUB_WORKSPACE "src") "defaults.json"
$CodeQLBundleName = (Get-Content -Raw -Path $DefaultsPath | ConvertFrom-Json).bundleVersion
$CodeQLVersion = "0.0.0-" + $CodeQLBundleName.split("-")[-1]
py -3 $Env:GITHUB_WORKSPACE\\python-setup\\auto_install_packages.py C:\\hostedtoolcache\\windows\\CodeQL\\$CodeQLVersion\\x64\\codeql
$codeql_dist = (get-item $Env:CODEQL_PATH).Directory.FullName
py -3 $Env:GITHUB_WORKSPACE\\python-setup\\auto_install_packages.py $codeql_dist
- name: Setup for extractor
run: |
Expand Down

0 comments on commit 5794d96

Please sign in to comment.