From 87b3bcb31d91d9992cc2f4226f59b3f1fdc9bbfd Mon Sep 17 00:00:00 2001 From: Anmol Sethi Date: Tue, 29 Nov 2022 13:54:11 -0800 Subject: [PATCH 1/2] make.sh: Clone submodules automatically --- .github/workflows/ci.yml | 2 -- .github/workflows/daily.yml | 2 -- make.sh | 3 +++ 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b97e10c55..cdd572bc2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -9,8 +9,6 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - with: - submodules: recursive - uses: actions/setup-go@v3 with: go-version-file: ./go.mod diff --git a/.github/workflows/daily.yml b/.github/workflows/daily.yml index 58b485496..9fc372532 100644 --- a/.github/workflows/daily.yml +++ b/.github/workflows/daily.yml @@ -14,8 +14,6 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - with: - submodules: recursive - uses: actions/setup-go@v3 with: go-version-file: ./go.mod diff --git a/make.sh b/make.sh index 29fa6689b..9f6290641 100755 --- a/make.sh +++ b/make.sh @@ -1,5 +1,8 @@ #!/bin/sh set -eu +if [ ! -d "$(dirname "$0")/ci/sub/.git" ]; then + git submodule update --init +fi . "$(dirname "$0")/ci/sub/lib.sh" PATH="$(cd -- "$(dirname "$0")" && pwd)/ci/sub/bin:$PATH" cd "$(dirname "$0")" From 27a6e219a4c92726dfc40c05a3837076ed208cea Mon Sep 17 00:00:00 2001 From: Anmol Sethi Date: Tue, 29 Nov 2022 14:57:48 -0800 Subject: [PATCH 2/2] ci/sub: Update --- ci/sub | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/sub b/ci/sub index 18ad1a278..029fdc1c9 160000 --- a/ci/sub +++ b/ci/sub @@ -1 +1 @@ -Subproject commit 18ad1a2780f6e9119439a4b015de1ce0b875e0ba +Subproject commit 029fdc1c9533b5bfb9c76b50bdb6d52eea7ddbeb