From d16268b2730cc78e4deffe9e7c2bf9867ae8bcd4 Mon Sep 17 00:00:00 2001 From: Andrew Eisenberg Date: Wed, 16 Jun 2021 09:58:12 -0700 Subject: [PATCH 1/2] Fix update-release-branch-fix.py This change ensures that the the script can handle commits with no committer in them. This will happen for some commits that are auto-generated during PRs. --- .github/update-release-branch.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/update-release-branch.py b/.github/update-release-branch.py index 5e839dd55c..749e315b1f 100644 --- a/.github/update-release-branch.py +++ b/.github/update-release-branch.py @@ -122,7 +122,7 @@ def get_commit_difference(repo): # Is the given commit the automatic merge commit from when merging a PR def is_pr_merge_commit(commit): - return commit.committer.login == 'web-flow' and len(commit.parents) > 1 + return commit.committer is not None and commit.committer.login == 'web-flow' and len(commit.parents) > 1 # Gets a copy of the commit message that should display nicely def get_truncated_commit_message(commit): From efea9238bc5dfa0d26fb197cb8f903b93deed602 Mon Sep 17 00:00:00 2001 From: Andrew Eisenberg Date: Wed, 16 Jun 2021 10:38:59 -0700 Subject: [PATCH 2/2] Fix custom version of CLI to use for package testing This can be removed when 2.5.6 is released. --- .github/workflows/pr-checks.yml | 4 ++-- .../.github/codeql/codeql-config-packaging.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pr-checks.yml b/.github/workflows/pr-checks.yml index a5b237e9bb..1bd68a388b 100644 --- a/.github/workflows/pr-checks.yml +++ b/.github/workflows/pr-checks.yml @@ -118,8 +118,8 @@ jobs: with: config-file: ".github/codeql/codeql-config-packaging.yml" languages: javascript - # TODO: this is temporary until we have a release that includes the latest packaging work. - tools: https://github.com/dsp-testing/aeisenberg-codeql-action-packaging/releases/download/codeql-bundle-20210606/codeql-bundle-linux64.tar.gz + # TODO: this can be removed when cli v2.5.6 is released and available in the tool cache + tools: https://github.com/dsp-testing/aeisenberg-codeql-action-packaging/releases/download/codeql-bundle-20210615/codeql-bundle-linux64.tar.gz - name: Build code shell: bash diff --git a/tests/multi-language-repo/.github/codeql/codeql-config-packaging.yml b/tests/multi-language-repo/.github/codeql/codeql-config-packaging.yml index de637a170c..4ccba55aad 100644 --- a/tests/multi-language-repo/.github/codeql/codeql-config-packaging.yml +++ b/tests/multi-language-repo/.github/codeql/codeql-config-packaging.yml @@ -3,7 +3,7 @@ name: Pack testing in the CodeQL Action disable-default-queries: true packs: javascript: - - dsp-testing/codeql-pack1@0.0.3 + - dsp-testing/codeql-pack1@0.0.4 - dsp-testing/codeql-pack2 # latest paths-ignore: - tests