Skip to content

Merge main into v1 - #252

Merged
cbraynor merged 41 commits into
v1from
update-v1-a1fc3a5e
Oct 5, 2020
Merged

Merge main into v1#252
cbraynor merged 41 commits into
v1from
update-v1-a1fc3a5e

Conversation

@github-actions

Copy link
Copy Markdown
Contributor

Merging a1fc3a5 into v1

Conductor for this PR is @cbraynor

Contains the following pull requests:

Daverloand others added 30 commits September 11, 2020 10:53
Update Python scripts for "Python deps setup"
As we move towards analysing the merge commit for pull requests by
default, we should stop sending `/refs/pull/n/head` rather than
`refs/pull/n/merge` _unless_ the checked-out SHA has actually changed.
Here we assume that any change (compared to GITHUB_SHA) indicates that
`git checkout HEAD^2` has been run earlier. This may sometimes be
incorrect (e.g. `git checkout mybranch`), but in that case the ref
would be wrong either way.
Co-authored-by: Marco Gario <marcogario@github.com>
Resolve violations of no-throw-literal lint
Resolve violations of no-useless-escape lint
Do not always overwrite the GITHUB_REF for PRs
Resolve violations of sort-imports lint
aibaars
aibaars previously requested changes Oct 5, 2020

@aibaarsaibaars left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure having python specific features in the CodeQL action is the right way to address the python dependency installation problem.

@aibaarsaibaars left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Having the python scripts in the Action instead of the CodeQL bundle makes it possible to iterate more quickly to make improvements. This is a good reason in the short term. In the long run there is an increased risk of compatibility issues between the Action and the CodeQL python pack. Luckily, the automatic installation feature may not be needed in the future as the Python team is working on improving things such that having the dependencies installed would no longer be needed.

@Daverlo

Copy link
Copy Markdown
Contributor

Having the python scripts in the Action instead of the CodeQL bundle makes it possible to iterate more quickly to make improvements. This is a good reason in the short term. In the long run there is an increased risk of compatibility issues between the Action and the CodeQL python pack. Luckily, the automatic installation feature may not be needed in the future as the Python team is working on improving things such that having the dependencies installed would no longer be needed.

We know this is not the best solution, but is just a quick patch for unblocking this use case until the python extractor can manage the dependencies by itself and we could just drop all this process

@cbraynor

cbraynor commented Oct 5, 2020

Copy link
Copy Markdown
Contributor

Spoke to @aibaars - these comments are no longer gating

@cbraynor
cbraynor dismissed aibaars’s stale reviewOctober 5, 2020 15:20

Concerns are no longer gating

@cbraynor
cbraynor merged commit 5dc2db0 into v1Oct 5, 2020
@cbraynor
cbraynor deleted the update-v1-a1fc3a5e branch October 5, 2020 15:29
simon-engledew pushed a commit that referenced this pull request Dec 2, 2020
commit 1dd265a
Merge: 4dcb320c3a9325
Author: Simon Engledew <simon-engledew@github.com>
Date: Wed Dec 2 08:31:48 2020 +0000
Merge pull request #333 from github/simon-engledew/hide-warnings-v1
Hide a warning that is confusing on GHES
commit c3a9325
Author: Simon Engledew <simon-engledew@github.com>
Date: Tue Dec 1 16:54:23 2020 +0000
Hide an warning that is confusing on GHES
commit 4dcb320
Merge: 577fc45b15854c
Author: David Verdeguer <47184891+Daverlo@users.noreply.github.com>
Date: Mon Nov 23 15:01:13 2020 +0100
Merge pull request #317 from github/update-v1-b15854c9
Merge main into v1
commit 577fc45
Merge: 1de54f1d4eb1e3
Author: Robert <robertbrignull@github.com>
Date: Mon Nov 16 12:03:04 2020 +0000
Merge pull request #306 from github/update-v1-d4eb1e36
Merge main into v1
commit 1de54f1
Merge: e3bfd254b301bd
Author: Robin Neatherway <rneatherway@github.com>
Date: Mon Nov 9 15:42:20 2020 +0000
Merge pull request #295 from github/main
Update v1 with new CodeQL bundle
commit e3bfd25
Merge: 935dd40f13bd45
Author: Simon Engledew <simon-engledew@github.com>
Date: Mon Nov 9 10:22:41 2020 +0000
Merge pull request #293 from github/update-v1-f13bd452
Merge main into v1
commit 935dd40
Merge: 253ef429a0139e
Author: David Verdeguer <47184891+Daverlo@users.noreply.github.com>
Date: Tue Nov 3 11:27:07 2020 +0100
Merge pull request #286 from github/update-v1-9a0139ee
Merge main into v1
commit 253ef42
Merge: 7507a5a46110c3
Author: David Verdeguer <47184891+Daverlo@users.noreply.github.com>
Date: Wed Oct 28 11:38:54 2020 +0100
Merge pull request #279 from github/update-v1-46110c36
Merge main into v1
commit 7507a5a
Merge: 4a27006c8b8c04
Author: Robin Neatherway <rneatherway@github.com>
Date: Mon Oct 19 12:38:26 2020 +0100
Merge pull request #269 from github/update-v1-c8b8c041
Merge main into v1
commit 4a27006
Merge: 5dc2db0b1e2c9b
Author: Marco Gario <marcogario@github.com>
Date: Wed Oct 7 13:31:57 2020 +0200
Merge pull request #256 from github/update-v1-b1e2c9b8
Merge main into v1
commit 5dc2db0
Merge: 8ea621ea1fc3a5
Author: Chris Raynor <cbraynor@github.com>
Date: Mon Oct 5 16:29:49 2020 +0100
Merge pull request #252 from github/update-v1-a1fc3a5e
Merge main into v1
commit 8ea621e
Merge: c7c948af2e557e
Author: Robert <robertbrignull@github.com>
Date: Tue Sep 29 10:34:59 2020 +0100
Merge pull request #234 from github/update-v1-f2e557e7
Merge main into v1
commit c7c948a
Merge: f6894d6b2dfa6e
Author: Robert <robertbrignull@github.com>
Date: Mon Sep 21 11:04:47 2020 +0100
Merge pull request #224 from github/update-v1-b2dfa6e6
Merge main into v1
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants

@Daverlo@cbraynor@aibaars@RasmusWL@rneatherway@miqh@marcogario@thaJeztah