From 75fb2a4c7d75745a06db68bade5ce1195e92c08d Mon Sep 17 00:00:00 2001 From: Nick Rolfe Date: Tue, 31 May 2022 16:10:16 +0100 Subject: [PATCH 1/3] Update CodeQL submodule --- ql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ql b/ql index b13123e..8cd261a 160000 --- a/ql +++ b/ql @@ -1 +1 @@ -Subproject commit b13123e66ed723b31f801e82b2ccb2ffb2428db4 +Subproject commit 8cd261af0ed7edb7cd6b8ea6a0ffd99033b79783 From 0c464f83f0a90f4f1693f68978574cdfea8d3323 Mon Sep 17 00:00:00 2001 From: Nick Rolfe Date: Tue, 31 May 2022 16:11:18 +0100 Subject: [PATCH 2/3] Delete codeql-go submodule --- .gitmodules | 4 ---- codeql-go | 1 - 2 files changed, 5 deletions(-) delete mode 160000 codeql-go diff --git a/.gitmodules b/.gitmodules index 6d2405b..381ac09 100644 --- a/.gitmodules +++ b/.gitmodules @@ -2,7 +2,3 @@ path = ql url = https://github.com/github/codeql.git branch = lgtm.com -[submodule "codeql-go"] - path = codeql-go - url = https://github.com/github/codeql-go.git - branch = lgtm.com diff --git a/codeql-go b/codeql-go deleted file mode 160000 index 3423729..0000000 --- a/codeql-go +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 3423729f4c8680fee080801d7fd84430b015d4f9 From 809d605a41e94a7903cef3b63a4d146efdd61f05 Mon Sep 17 00:00:00 2001 From: Nick Rolfe Date: Tue, 31 May 2022 16:37:04 +0100 Subject: [PATCH 3/3] Stop checking go submodule --- .github/workflows/check-submodule-pointers.yml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/.github/workflows/check-submodule-pointers.yml b/.github/workflows/check-submodule-pointers.yml index b25edc5..a7bca5a 100644 --- a/.github/workflows/check-submodule-pointers.yml +++ b/.github/workflows/check-submodule-pointers.yml @@ -27,11 +27,3 @@ jobs: echo "::error:: The ql submodule is out of date with the lgtm.com branch of github/codeql. Expected $CODEQL_EXPECTED_SHA, found $CODEQL_ACTUAL_SHA." exit 1 fi - - CODEQL_GO_ACTUAL_SHA="$(git rev-parse @:./codeql-go)" - CODEQL_GO_EXPECTED_SHA="$(gh api repos/github/codeql-go/git/ref/heads/lgtm.com --jq '.object.sha')" - echo "The codeql-go submodule currently points to $CODEQL_GO_ACTUAL_SHA. The tip of the lgtm.com branch of github/codeql-go is $CODEQL_GO_EXPECTED_SHA." - if [ "$CODEQL_GO_EXPECTED_SHA" != "$CODEQL_GO_ACTUAL_SHA" ]; then - echo "::error:: The codeql-go submodule is out of date with the lgtm.com branch of github/codeql-go. Expected $CODEQL_GO_EXPECTED_SHA, found $CODEQL_GO_ACTUAL_SHA." - exit 1 - fi