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)"
vectordotdev · Jun 29, 2023 · ff448f8 · ff448f8
1 parent 3dcf59d
commit ff448f8
Show file tree

Hide file tree

Showing 18 changed files with 1 addition and 89 deletions.
diff --git a/.github/audit.yml b/.github/audit.yml
@@ -11,9 +11,7 @@ jobs:
   security_audit:
     runs-on: ubuntu-20.04
     steps:
-      - uses: actions/checkout@v3
-        with:
-          submodules: "recursive"
+      - uses: actions/checkout@v1
       - uses: actions-rs/audit-check@v1
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/changes.yml b/.github/workflows/changes.yml
@@ -119,8 +119,6 @@ jobs:
       k8s: ${{ steps.filter.outputs.k8s }}
     steps:
     - uses: actions/checkout@v3
-      with:
-        submodules: "recursive"
 
     - uses: dorny/paths-filter@v2
       id: filter
@@ -214,8 +212,6 @@ jobs:
       webhdfs: ${{ steps.filter.outputs.webhdfs }}
     steps:
       - uses: actions/checkout@v3
-        with:
-          submodules: "recursive"
 
       # creates a yaml file that contains the filters for each integration,
       # extracted from the output of the `vdev int ci-paths` command, which

diff --git a/.github/workflows/cli.yml b/.github/workflows/cli.yml
@@ -28,13 +28,10 @@ jobs:
         uses: actions/checkout@v3
         with:
           ref: ${{ steps.comment-branch.outputs.head_ref }}
-          submodules: "recursive"
 
       - name: Checkout branch
         if: ${{ github.event_name != 'issue_comment' }}
         uses: actions/checkout@v3
-        with:
-          submodules: "recursive"
 
       - name: Cache Cargo registry + index
         uses: actions/cache@v3

diff --git a/.github/workflows/compilation-timings.yml b/.github/workflows/compilation-timings.yml
@@ -17,8 +17,6 @@ jobs:
     steps:
       - uses: colpal/actions-clean@v1
       - uses: actions/checkout@v3
-        with:
-          submodules: "recursive"
       - run: sudo -E bash scripts/environment/bootstrap-ubuntu-20.04.sh
       - run: bash scripts/environment/prepare.sh
       - run: cargo clean
@@ -35,8 +33,6 @@ jobs:
     steps:
       - uses: colpal/actions-clean@v1
       - uses: actions/checkout@v3
-        with:
-          submodules: "recursive"
       - run: sudo -E bash scripts/environment/bootstrap-ubuntu-20.04.sh
       - run: bash scripts/environment/prepare.sh
       - run: cargo clean
@@ -48,8 +44,6 @@ jobs:
     steps:
       - uses: colpal/actions-clean@v1
       - uses: actions/checkout@v3
-        with:
-          submodules: "recursive"
       - run: sudo -E bash scripts/environment/bootstrap-ubuntu-20.04.sh
       - run: bash scripts/environment/prepare.sh
       - run: cargo clean
@@ -61,8 +55,6 @@ jobs:
     steps:
       - uses: colpal/actions-clean@v1
       - uses: actions/checkout@v3
-        with:
-          submodules: "recursive"
       - run: sudo -E bash scripts/environment/bootstrap-ubuntu-20.04.sh
       - run: bash scripts/environment/prepare.sh
       - run: cargo clean
@@ -76,8 +68,6 @@ jobs:
     steps:
       - uses: colpal/actions-clean@v1
       - uses: actions/checkout@v3
-        with:
-          submodules: "recursive"
       - run: sudo -E bash scripts/environment/bootstrap-ubuntu-20.04.sh
       - run: bash scripts/environment/prepare.sh
       - run: cargo clean

diff --git a/.github/workflows/component_features.yml b/.github/workflows/component_features.yml
@@ -26,13 +26,10 @@ jobs:
         uses: actions/checkout@v3
         with:
           ref: ${{ steps.comment-branch.outputs.head_ref }}
-          submodules: "recursive"
 
       - name: Checkout branch
         if: ${{ github.event_name != 'issue_comment' }}
         uses: actions/checkout@v3
-        with:
-          submodules: "recursive"
 
       - run: sudo -E bash scripts/environment/bootstrap-ubuntu-20.04.sh
       - run: bash scripts/environment/prepare.sh

diff --git a/.github/workflows/cross.yml b/.github/workflows/cross.yml
@@ -39,13 +39,10 @@ jobs:
         uses: actions/checkout@v3
         with:
           ref: ${{ steps.comment-branch.outputs.head_ref }}
-          submodules: "recursive"
 
       - name: Checkout branch
         if: ${{ github.event_name != 'issue_comment' }}
         uses: actions/checkout@v3
-        with:
-          submodules: "recursive"
 
       - uses: actions/cache@v3
         name: Cache Cargo registry + index

diff --git a/.github/workflows/environment.yml b/.github/workflows/environment.yml
@@ -34,13 +34,10 @@ jobs:
         uses: actions/checkout@v3
         with:
           ref: ${{ steps.comment-branch.outputs.head_ref }}
-          submodules: "recursive"
 
       - name: Checkout branch
         if: ${{ github.event_name != 'issue_comment' }}
         uses: actions/checkout@v3
-        with:
-          submodules: "recursive"
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v2.2.0

diff --git a/.github/workflows/gardener_remove_waiting_author.yml b/.github/workflows/gardener_remove_waiting_author.yml
@@ -9,8 +9,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-        with:
-          submodules: "recursive"
       - uses: actions-ecosystem/action-remove-labels@v1
         with:
           labels: "meta: awaiting author"
diff --git a/.github/workflows/install-sh.yml b/.github/workflows/install-sh.yml
@@ -28,13 +28,10 @@ jobs:
         uses: actions/checkout@v3
         with:
           ref: ${{ steps.comment-branch.outputs.head_ref }}
-          submodules: "recursive"
 
       - name: Checkout branch
         if: ${{ github.event_name != 'issue_comment' }}
         uses: actions/checkout@v3
-        with:
-          submodules: "recursive"
 
       - run: pip3 install awscli --upgrade --user
       - env:

diff --git a/.github/workflows/integration-test.yml b/.github/workflows/integration-test.yml
@@ -54,13 +54,10 @@ jobs:
         uses: actions/checkout@v3
         with:
           ref: ${{ steps.comment-branch.outputs.head_ref }}
-          submodules: "recursive"
 
       - name: Checkout branch
         if: ${{ github.event_name != 'issue_comment' }}
         uses: actions/checkout@v3
-        with:
-          submodules: "recursive"
 
       - run: sudo npm -g install @datadog/datadog-ci
 

diff --git a/.github/workflows/k8s_e2e.yml b/.github/workflows/k8s_e2e.yml
@@ -88,13 +88,10 @@ jobs:
         uses: actions/checkout@v3
         with:
           ref: ${{ steps.comment-branch.outputs.head_ref }}
-          submodules: "recursive"
 
       - name: Checkout branch
         if: ${{ github.event_name != 'issue_comment' }}
         uses: actions/checkout@v3
-        with:
-          submodules: "recursive"
 
       - uses: actions/cache@v3
         with:
@@ -208,13 +205,10 @@ jobs:
         uses: actions/checkout@v3
         with:
           ref: ${{ steps.comment-branch.outputs.head_ref }}
-          submodules: "recursive"
 
       - name: Checkout branch
         if: ${{ github.event_name != 'issue_comment' }}
         uses: actions/checkout@v3
-        with:
-          submodules: "recursive"
 
       - uses: actions/download-artifact@v3
         with:

diff --git a/.github/workflows/misc.yml b/.github/workflows/misc.yml
@@ -28,13 +28,10 @@ jobs:
         uses: actions/checkout@v3
         with:
           ref: ${{ steps.comment-branch.outputs.head_ref }}
-          submodules: "recursive"
 
       - name: Checkout branch
         if: ${{ github.event_name != 'issue_comment' }}
         uses: actions/checkout@v3
-        with:
-          submodules: "recursive"
 
       - uses: actions/cache@v3
         name: Cache Cargo registry + index

diff --git a/.github/workflows/msrv.yml b/.github/workflows/msrv.yml
@@ -16,8 +16,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-        with:
-          submodules: "recursive"
       - run: sudo -E bash scripts/environment/bootstrap-ubuntu-20.04.sh
       - run: cargo install cargo-msrv --version 0.15.1
       - run: cargo msrv verify
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -39,7 +39,6 @@ jobs:
         uses: actions/checkout@v3
         with:
           ref: ${{ inputs.git_ref }}
-          submodules: "recursive"
       - name: Generate publish metadata
         id: generate-publish-metadata
         run: make ci-generate-publish-metadata
@@ -57,7 +56,6 @@ jobs:
         uses: actions/checkout@v3
         with:
           ref: ${{ inputs.git_ref }}
-          submodules: "recursive"
       - name: Bootstrap runner environment (Ubuntu-specific)
         run: sudo -E bash scripts/environment/bootstrap-ubuntu-20.04.sh
       - name: Bootstrap runner environment (generic)
@@ -83,7 +81,6 @@ jobs:
         uses: actions/checkout@v3
         with:
           ref: ${{ inputs.git_ref }}
-          submodules: "recursive"
       - name: Bootstrap runner environment (Ubuntu-specific)
         run: sudo -E bash scripts/environment/bootstrap-ubuntu-20.04.sh
       - name: Bootstrap runner environment (generic)
@@ -109,7 +106,6 @@ jobs:
         uses: actions/checkout@v3
         with:
           ref: ${{ inputs.git_ref }}
-          submodules: "recursive"
       - name: Bootstrap runner environment (Ubuntu-specific)
         run: sudo -E bash scripts/environment/bootstrap-ubuntu-20.04.sh
       - name: Bootstrap runner environment (generic)
@@ -137,7 +133,6 @@ jobs:
         uses: actions/checkout@v3
         with:
           ref: ${{ inputs.git_ref }}
-          submodules: "recursive"
       - name: Bootstrap runner environment (Ubuntu-specific)
         run: sudo -E bash scripts/environment/bootstrap-ubuntu-20.04.sh
       - name: Bootstrap runner environment (generic)
@@ -165,7 +160,6 @@ jobs:
         uses: actions/checkout@v3
         with:
           ref: ${{ inputs.git_ref }}
-          submodules: "recursive"
       - name: Bootstrap runner environment (Ubuntu-specific)
         run: sudo -E bash scripts/environment/bootstrap-ubuntu-20.04.sh
       - name: Bootstrap runner environment (generic)
@@ -193,7 +187,6 @@ jobs:
         uses: actions/checkout@v3
         with:
           ref: ${{ inputs.git_ref }}
-          submodules: "recursive"
       - name: Bootstrap runner environment (Ubuntu-specific)
         run: sudo -E bash scripts/environment/bootstrap-ubuntu-20.04.sh
       - name: Bootstrap runner environment (generic)
@@ -221,7 +214,6 @@ jobs:
         uses: actions/checkout@v3
         with:
           ref: ${{ inputs.git_ref }}
-          submodules: "recursive"
       - name: Bootstrap runner environment (macOS-specific)
         run: bash scripts/environment/bootstrap-macos-10.sh
       - name: Build Vector
@@ -252,7 +244,6 @@ jobs:
         uses: actions/checkout@v3
         with:
           ref: ${{ inputs.git_ref }}
-          submodules: "recursive"
       - name: Bootstrap runner environment (Windows-specific)
         run: .\scripts\environment\bootstrap-windows-2019.ps1
       - name: Install Wix
@@ -320,11 +311,6 @@ jobs:
         uses: actions/checkout@v3
         with:
           ref: ${{ inputs.git_ref }}
-        # Workaround for older OS images
-        # https://github.com/actions/checkout/issues/758
-      - name: Checkout submodules
-        run: |
-          git submodule update --init --recursive
       - name: Download staged package artifacts (x86_64-unknown-linux-gnu)
         uses: actions/download-artifact@v3
         with:
@@ -381,7 +367,6 @@ jobs:
         uses: actions/checkout@v3
         with:
           ref: ${{ inputs.git_ref }}
-          submodules: "recursive"
       - name: Download staged package artifacts (x86_64-unknown-linux-gnu)
         uses: actions/download-artifact@v3
         with:
@@ -409,7 +394,6 @@ jobs:
         uses: actions/checkout@v3
         with:
           ref: ${{ inputs.git_ref }}
-          submodules: "recursive"
       - name: Download staged package artifacts (x86_64-apple-darwin)
         uses: actions/download-artifact@v3
         with:
@@ -440,7 +424,6 @@ jobs:
         uses: actions/checkout@v3
         with:
           ref: ${{ inputs.git_ref }}
-          submodules: "recursive"
       - name: Login to DockerHub
         uses: docker/login-action@v2.1.0
         with:
@@ -516,7 +499,6 @@ jobs:
         uses: actions/checkout@v3
         with:
           ref: ${{ inputs.git_ref }}
-          submodules: "recursive"
       - name: Download staged package artifacts (aarch64-unknown-linux-gnu)
         uses: actions/download-artifact@v3
         with:
@@ -588,7 +570,6 @@ jobs:
         uses: actions/checkout@v3
         with:
           ref: ${{ inputs.git_ref }}
-          submodules: "recursive"
       - name: Download staged package artifacts (aarch64-unknown-linux-gnu)
         uses: actions/download-artifact@v3
         with:
@@ -649,7 +630,6 @@ jobs:
         uses: actions/checkout@v3
         with:
           ref: ${{ inputs.git_ref }}
-          submodules: "recursive"
       - name: Publish update to Homebrew tap
         env:
           GITHUB_TOKEN: ${{ secrets.GH_PACKAGE_PUBLISHER_TOKEN }}
@@ -675,7 +655,6 @@ jobs:
         uses: actions/checkout@v3
         with:
           ref: ${{ inputs.git_ref }}
-          submodules: "recursive"
       - name: Download staged package artifacts (aarch64-unknown-linux-gnu)
         uses: actions/download-artifact@v3
         with: