robojerk/codeql-action

Merge branch 'main' into simon-engledew/warning-undefined

Browse source
This commit is contained in:
Simon Engledew 2021-02-02 10:06:49 +00:00 • committed by GitHub
commit f3f5dfd3df
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.github/update-release-branch.py vendored
View file

@ -95,7 +95,7 @@ def get_conductor(repo, pull_requests, other_commits):
# This will not include any commits that exist on the release branch
# that aren't on main.
def get_commit_difference(repo):
commits = run_git('log', '--pretty=format:%H', ORIGIN + '/' + LATEST_RELEASE_BRANCH + '...' + MAIN_BRANCH).strip().split('\n')
commits = run_git('log', '--pretty=format:%H', ORIGIN + '/' + LATEST_RELEASE_BRANCH + '..' + MAIN_BRANCH).strip().split('\n')
# Convert to full-fledged commit objects
commits = [repo.get_commit(c) for c in commits]

2
python-setup/install_tools.sh
View file

@ -31,7 +31,7 @@ python3 -m pip install --user pipenv
if command -v python2 &> /dev/null; then
# Setup Python 2 dependency installation tools.
# The Ubuntu 20.04 GHA environment does not come with a Python 2 pip
curl --location --fail https://bootstrap.pypa.io/get-pip.py | python2
curl --location --fail https://bootstrap.pypa.io/2.7/get-pip.py | python2
python2 -m pip install --user --upgrade pip setuptools wheel