Skip to content

Commit d8d57e5

Browse files
spencergilbertspencergilbert
authored
chore: Revert all submodule introductions to fix CI (#17800)
- Revert "chore: Fix publish workflow for older OS images (#17787)" - Revert "chore: Add submodules to all checkouts (#17770)" - Revert "chore: Download submodules in the CI checkouts (#17760)"
1 parent 6eecda5 commit d8d57e5

18 files changed

+1
-89
lines changed

‎.github/audit.yml

+1-3
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,7 @@ jobs:
1111
security_audit:
1212
runs-on: ubuntu-20.04
1313
steps:
14-
- uses: actions/checkout@v3
15-
with:
16-
submodules: "recursive"
14+
- uses: actions/checkout@v1
1715
- uses: actions-rs/audit-check@v1
1816
with:
1917
token: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/changes.yml

-4
Original file line numberDiff line numberDiff line change
@@ -119,8 +119,6 @@ jobs:
119119
k8s: ${{ steps.filter.outputs.k8s }}
120120
steps:
121121
- uses: actions/checkout@v3
122-
with:
123-
submodules: "recursive"
124122

125123
- uses: dorny/paths-filter@v2
126124
id: filter
@@ -214,8 +212,6 @@ jobs:
214212
webhdfs: ${{ steps.filter.outputs.webhdfs }}
215213
steps:
216214
- uses: actions/checkout@v3
217-
with:
218-
submodules: "recursive"
219215

220216
# creates a yaml file that contains the filters for each integration,
221217
# extracted from the output of the `vdev int ci-paths` command, which

‎.github/workflows/cli.yml

-3
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,10 @@ jobs:
2828
uses: actions/checkout@v3
2929
with:
3030
ref: ${{ steps.comment-branch.outputs.head_ref }}
31-
submodules: "recursive"
3231

3332
- name: Checkout branch
3433
if: ${{ github.event_name != 'issue_comment' }}
3534
uses: actions/checkout@v3
36-
with:
37-
submodules: "recursive"
3835

3936
- name: Cache Cargo registry + index
4037
uses: actions/cache@v3

‎.github/workflows/compilation-timings.yml

-10
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@ jobs:
1717
steps:
1818
- uses: colpal/actions-clean@v1
1919
- uses: actions/checkout@v3
20-
with:
21-
submodules: "recursive"
2220
- run: sudo -E bash scripts/environment/bootstrap-ubuntu-20.04.sh
2321
- run: bash scripts/environment/prepare.sh
2422
- run: cargo clean
@@ -35,8 +33,6 @@ jobs:
3533
steps:
3634
- uses: colpal/actions-clean@v1
3735
- uses: actions/checkout@v3
38-
with:
39-
submodules: "recursive"
4036
- run: sudo -E bash scripts/environment/bootstrap-ubuntu-20.04.sh
4137
- run: bash scripts/environment/prepare.sh
4238
- run: cargo clean
@@ -48,8 +44,6 @@ jobs:
4844
steps:
4945
- uses: colpal/actions-clean@v1
5046
- uses: actions/checkout@v3
51-
with:
52-
submodules: "recursive"
5347
- run: sudo -E bash scripts/environment/bootstrap-ubuntu-20.04.sh
5448
- run: bash scripts/environment/prepare.sh
5549
- run: cargo clean
@@ -61,8 +55,6 @@ jobs:
6155
steps:
6256
- uses: colpal/actions-clean@v1
6357
- uses: actions/checkout@v3
64-
with:
65-
submodules: "recursive"
6658
- run: sudo -E bash scripts/environment/bootstrap-ubuntu-20.04.sh
6759
- run: bash scripts/environment/prepare.sh
6860
- run: cargo clean
@@ -76,8 +68,6 @@ jobs:
7668
steps:
7769
- uses: colpal/actions-clean@v1
7870
- uses: actions/checkout@v3
79-
with:
80-
submodules: "recursive"
8171
- run: sudo -E bash scripts/environment/bootstrap-ubuntu-20.04.sh
8272
- run: bash scripts/environment/prepare.sh
8373
- run: cargo clean

‎.github/workflows/component_features.yml

-3
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,10 @@ jobs:
2626
uses: actions/checkout@v3
2727
with:
2828
ref: ${{ steps.comment-branch.outputs.head_ref }}
29-
submodules: "recursive"
3029

3130
- name: Checkout branch
3231
if: ${{ github.event_name != 'issue_comment' }}
3332
uses: actions/checkout@v3
34-
with:
35-
submodules: "recursive"
3633

3734
- run: sudo -E bash scripts/environment/bootstrap-ubuntu-20.04.sh
3835
- run: bash scripts/environment/prepare.sh

‎.github/workflows/cross.yml

-3
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,10 @@ jobs:
3939
uses: actions/checkout@v3
4040
with:
4141
ref: ${{ steps.comment-branch.outputs.head_ref }}
42-
submodules: "recursive"
4342

4443
- name: Checkout branch
4544
if: ${{ github.event_name != 'issue_comment' }}
4645
uses: actions/checkout@v3
47-
with:
48-
submodules: "recursive"
4946

5047
- uses: actions/cache@v3
5148
name: Cache Cargo registry + index

‎.github/workflows/environment.yml

-3
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,10 @@ jobs:
3434
uses: actions/checkout@v3
3535
with:
3636
ref: ${{ steps.comment-branch.outputs.head_ref }}
37-
submodules: "recursive"
3837

3938
- name: Checkout branch
4039
if: ${{ github.event_name != 'issue_comment' }}
4140
uses: actions/checkout@v3
42-
with:
43-
submodules: "recursive"
4441

4542
- name: Set up QEMU
4643
uses: docker/setup-qemu-action@v2.2.0

‎.github/workflows/gardener_remove_waiting_author.yml

-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@ jobs:
99
runs-on: ubuntu-latest
1010
steps:
1111
- uses: actions/checkout@v3
12-
with:
13-
submodules: "recursive"
1412
- uses: actions-ecosystem/action-remove-labels@v1
1513
with:
1614
labels: "meta: awaiting author"

‎.github/workflows/install-sh.yml

-3
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,10 @@ jobs:
2828
uses: actions/checkout@v3
2929
with:
3030
ref: ${{ steps.comment-branch.outputs.head_ref }}
31-
submodules: "recursive"
3231

3332
- name: Checkout branch
3433
if: ${{ github.event_name != 'issue_comment' }}
3534
uses: actions/checkout@v3
36-
with:
37-
submodules: "recursive"
3835

3936
- run: pip3 install awscli --upgrade --user
4037
- env:

‎.github/workflows/integration-test.yml

-3
Original file line numberDiff line numberDiff line change
@@ -54,13 +54,10 @@ jobs:
5454
uses: actions/checkout@v3
5555
with:
5656
ref: ${{ steps.comment-branch.outputs.head_ref }}
57-
submodules: "recursive"
5857

5958
- name: Checkout branch
6059
if: ${{ github.event_name != 'issue_comment' }}
6160
uses: actions/checkout@v3
62-
with:
63-
submodules: "recursive"
6461

6562
- run: sudo npm -g install @datadog/datadog-ci
6663

‎.github/workflows/k8s_e2e.yml

-6
Original file line numberDiff line numberDiff line change
@@ -88,13 +88,10 @@ jobs:
8888
uses: actions/checkout@v3
8989
with:
9090
ref: ${{ steps.comment-branch.outputs.head_ref }}
91-
submodules: "recursive"
9291

9392
- name: Checkout branch
9493
if: ${{ github.event_name != 'issue_comment' }}
9594
uses: actions/checkout@v3
96-
with:
97-
submodules: "recursive"
9895

9996
- uses: actions/cache@v3
10097
with:
@@ -208,13 +205,10 @@ jobs:
208205
uses: actions/checkout@v3
209206
with:
210207
ref: ${{ steps.comment-branch.outputs.head_ref }}
211-
submodules: "recursive"
212208

213209
- name: Checkout branch
214210
if: ${{ github.event_name != 'issue_comment' }}
215211
uses: actions/checkout@v3
216-
with:
217-
submodules: "recursive"
218212

219213
- uses: actions/download-artifact@v3
220214
with:

‎.github/workflows/misc.yml

-3
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,10 @@ jobs:
2828
uses: actions/checkout@v3
2929
with:
3030
ref: ${{ steps.comment-branch.outputs.head_ref }}
31-
submodules: "recursive"
3231

3332
- name: Checkout branch
3433
if: ${{ github.event_name != 'issue_comment' }}
3534
uses: actions/checkout@v3
36-
with:
37-
submodules: "recursive"
3835

3936
- uses: actions/cache@v3
4037
name: Cache Cargo registry + index

‎.github/workflows/msrv.yml

-2
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@ jobs:
1616
runs-on: ubuntu-latest
1717
steps:
1818
- uses: actions/checkout@v3
19-
with:
20-
submodules: "recursive"
2119
- run: sudo -E bash scripts/environment/bootstrap-ubuntu-20.04.sh
2220
- run: cargo install cargo-msrv --version 0.15.1
2321
- run: cargo msrv verify

‎.github/workflows/publish.yml

-21
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ jobs:
3939
uses: actions/checkout@v3
4040
with:
4141
ref: ${{ inputs.git_ref }}
42-
submodules: "recursive"
4342
- name: Generate publish metadata
4443
id: generate-publish-metadata
4544
run: make ci-generate-publish-metadata
@@ -57,7 +56,6 @@ jobs:
5756
uses: actions/checkout@v3
5857
with:
5958
ref: ${{ inputs.git_ref }}
60-
submodules: "recursive"
6159
- name: Bootstrap runner environment (Ubuntu-specific)
6260
run: sudo -E bash scripts/environment/bootstrap-ubuntu-20.04.sh
6361
- name: Bootstrap runner environment (generic)
@@ -83,7 +81,6 @@ jobs:
8381
uses: actions/checkout@v3
8482
with:
8583
ref: ${{ inputs.git_ref }}
86-
submodules: "recursive"
8784
- name: Bootstrap runner environment (Ubuntu-specific)
8885
run: sudo -E bash scripts/environment/bootstrap-ubuntu-20.04.sh
8986
- name: Bootstrap runner environment (generic)
@@ -109,7 +106,6 @@ jobs:
109106
uses: actions/checkout@v3
110107
with:
111108
ref: ${{ inputs.git_ref }}
112-
submodules: "recursive"
113109
- name: Bootstrap runner environment (Ubuntu-specific)
114110
run: sudo -E bash scripts/environment/bootstrap-ubuntu-20.04.sh
115111
- name: Bootstrap runner environment (generic)
@@ -137,7 +133,6 @@ jobs:
137133
uses: actions/checkout@v3
138134
with:
139135
ref: ${{ inputs.git_ref }}
140-
submodules: "recursive"
141136
- name: Bootstrap runner environment (Ubuntu-specific)
142137
run: sudo -E bash scripts/environment/bootstrap-ubuntu-20.04.sh
143138
- name: Bootstrap runner environment (generic)
@@ -165,7 +160,6 @@ jobs:
165160
uses: actions/checkout@v3
166161
with:
167162
ref: ${{ inputs.git_ref }}
168-
submodules: "recursive"
169163
- name: Bootstrap runner environment (Ubuntu-specific)
170164
run: sudo -E bash scripts/environment/bootstrap-ubuntu-20.04.sh
171165
- name: Bootstrap runner environment (generic)
@@ -193,7 +187,6 @@ jobs:
193187
uses: actions/checkout@v3
194188
with:
195189
ref: ${{ inputs.git_ref }}
196-
submodules: "recursive"
197190
- name: Bootstrap runner environment (Ubuntu-specific)
198191
run: sudo -E bash scripts/environment/bootstrap-ubuntu-20.04.sh
199192
- name: Bootstrap runner environment (generic)
@@ -221,7 +214,6 @@ jobs:
221214
uses: actions/checkout@v3
222215
with:
223216
ref: ${{ inputs.git_ref }}
224-
submodules: "recursive"
225217
- name: Bootstrap runner environment (macOS-specific)
226218
run: bash scripts/environment/bootstrap-macos-10.sh
227219
- name: Build Vector
@@ -252,7 +244,6 @@ jobs:
252244
uses: actions/checkout@v3
253245
with:
254246
ref: ${{ inputs.git_ref }}
255-
submodules: "recursive"
256247
- name: Bootstrap runner environment (Windows-specific)
257248
run: .\scripts\environment\bootstrap-windows-2019.ps1
258249
- name: Install Wix
@@ -320,11 +311,6 @@ jobs:
320311
uses: actions/checkout@v3
321312
with:
322313
ref: ${{ inputs.git_ref }}
323-
# Workaround for older OS images
324-
# https://github.com/actions/checkout/issues/758
325-
- name: Checkout submodules
326-
run: |
327-
git submodule update --init --recursive
328314
- name: Download staged package artifacts (x86_64-unknown-linux-gnu)
329315
uses: actions/download-artifact@v3
330316
with:
@@ -381,7 +367,6 @@ jobs:
381367
uses: actions/checkout@v3
382368
with:
383369
ref: ${{ inputs.git_ref }}
384-
submodules: "recursive"
385370
- name: Download staged package artifacts (x86_64-unknown-linux-gnu)
386371
uses: actions/download-artifact@v3
387372
with:
@@ -409,7 +394,6 @@ jobs:
409394
uses: actions/checkout@v3
410395
with:
411396
ref: ${{ inputs.git_ref }}
412-
submodules: "recursive"
413397
- name: Download staged package artifacts (x86_64-apple-darwin)
414398
uses: actions/download-artifact@v3
415399
with:
@@ -440,7 +424,6 @@ jobs:
440424
uses: actions/checkout@v3
441425
with:
442426
ref: ${{ inputs.git_ref }}
443-
submodules: "recursive"
444427
- name: Login to DockerHub
445428
uses: docker/login-action@v2.1.0
446429
with:
@@ -516,7 +499,6 @@ jobs:
516499
uses: actions/checkout@v3
517500
with:
518501
ref: ${{ inputs.git_ref }}
519-
submodules: "recursive"
520502
- name: Download staged package artifacts (aarch64-unknown-linux-gnu)
521503
uses: actions/download-artifact@v3
522504
with:
@@ -588,7 +570,6 @@ jobs:
588570
uses: actions/checkout@v3
589571
with:
590572
ref: ${{ inputs.git_ref }}
591-
submodules: "recursive"
592573
- name: Download staged package artifacts (aarch64-unknown-linux-gnu)
593574
uses: actions/download-artifact@v3
594575
with:
@@ -649,7 +630,6 @@ jobs:
649630
uses: actions/checkout@v3
650631
with:
651632
ref: ${{ inputs.git_ref }}
652-
submodules: "recursive"
653633
- name: Publish update to Homebrew tap
654634
env:
655635
GITHUB_TOKEN: ${{ secrets.GH_PACKAGE_PUBLISHER_TOKEN }}
@@ -675,7 +655,6 @@ jobs:
675655
uses: actions/checkout@v3
676656
with:
677657
ref: ${{ inputs.git_ref }}
678-
submodules: "recursive"
679658
- name: Download staged package artifacts (aarch64-unknown-linux-gnu)
680659
uses: actions/download-artifact@v3
681660
with:

0 commit comments

Comments
 (0)