Skip to content

Commit

Permalink
Merge pull request #1715 from EliahKagan/ci-submodules
Browse files Browse the repository at this point in the history
Have init script clone submodules unconditionally
  • Loading branch information
Byron authored Oct 18, 2023
2 parents a5b2fa5 + 8ea3133 commit 5ba2b84
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 6 deletions.
1 change: 0 additions & 1 deletion .github/workflows/cygwin-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ jobs:
- uses: actions/checkout@v4
with:
fetch-depth: 0
submodules: recursive

- name: Install Cygwin
uses: cygwin/cygwin-install-action@v4
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/pythonpackage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ jobs:
- uses: actions/checkout@v4
with:
fetch-depth: 0
submodules: recursive

- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v4
Expand Down
6 changes: 2 additions & 4 deletions init-tests-after-clone.sh
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,8 @@ git reset --hard HEAD~1
# Point the master branch where we started, so we test the correct code.
git reset --hard __testing_point__

# The tests need submodules. (On CI, they would already have been checked out.)
if ! ci; then
git submodule update --init --recursive
fi
# The tests need submodules, including a submodule with a submodule.
git submodule update --init --recursive

# The tests need some version tags. Try to get them even in forks. This fetches
# other objects too. So, locally, we always do it, for a consistent experience.
Expand Down

0 comments on commit 5ba2b84

Please sign in to comment.