From e9b7551df5b8ad9439864d94c9532a47ea8a470e Mon Sep 17 00:00:00 2001
From: Brandon Shien <44730413+bshien@users.noreply.github.com>
Date: Tue, 3 Dec 2024 13:17:08 -0800
Subject: [PATCH] Remove dco and update artifact action to v4 (#1312)

Signed-off-by: Brandon Shien <bshien@amazon.com>
---
 .github/workflows/dco.yml                      | 18 ------------------
 .github/workflows/multi-node-test-workflow.yml |  2 +-
 .github/workflows/release-workflow.yml         |  2 +-
 .github/workflows/test-and-build-workflow.yml  |  8 ++++----
 4 files changed, 6 insertions(+), 24 deletions(-)
 delete mode 100644 .github/workflows/dco.yml

diff --git a/.github/workflows/dco.yml b/.github/workflows/dco.yml
deleted file mode 100644
index 53ed5304c..000000000
--- a/.github/workflows/dco.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-name: Developer Certificate of Origin Check
-
-on: [pull_request]
-
-jobs:
-  check:
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Get PR Commits
-        id: 'get-pr-commits'
-        uses: tim-actions/get-pr-commits@v1.1.0
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-      - name: DCO Check
-        uses: tim-actions/dco@v1.1.0
-        with:
-          commits: ${{ steps.get-pr-commits.outputs.commits }}
\ No newline at end of file
diff --git a/.github/workflows/multi-node-test-workflow.yml b/.github/workflows/multi-node-test-workflow.yml
index 8f634003a..908018eea 100644
--- a/.github/workflows/multi-node-test-workflow.yml
+++ b/.github/workflows/multi-node-test-workflow.yml
@@ -26,7 +26,7 @@ jobs:
       - name: Run integration tests with multi node config
         run: ./gradlew integTest -PnumNodes=3
       - name: Upload failed logs
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         if: failure()
         with:
           name: logs
diff --git a/.github/workflows/release-workflow.yml b/.github/workflows/release-workflow.yml
index b6343f9f1..c377a3737 100644
--- a/.github/workflows/release-workflow.yml
+++ b/.github/workflows/release-workflow.yml
@@ -115,7 +115,7 @@ jobs:
           asset_content_type: application/zip
 
       - name: Upload Workflow Artifacts
-        uses: actions/upload-artifact@v1
+        uses: actions/upload-artifact@v4
         with:
           name: index-management-plugin
           path: index-management-artifacts
diff --git a/.github/workflows/test-and-build-workflow.yml b/.github/workflows/test-and-build-workflow.yml
index 56d5cf4e3..5a49967a6 100644
--- a/.github/workflows/test-and-build-workflow.yml
+++ b/.github/workflows/test-and-build-workflow.yml
@@ -55,10 +55,10 @@ jobs:
         env:
           _JAVA_OPTIONS: ${{ matrix.os_java_options }}
       - name: Upload failed logs
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         if: ${{ failure() && matrix.os == 'ubuntu-latest' }}
         with:
-          name: logs
+          name: logs-${{ matrix.java }}
           path: build/testclusters/integTest-*/logs/*
       - name: Create Artifact Path
         run: |
@@ -71,7 +71,7 @@ jobs:
           token: ${{ secrets.CODECOV_TOKEN }}
       # This step uses the upload-artifact Github action: https://github.com/actions/upload-artifact
       - name: Upload Artifacts
-        uses: actions/upload-artifact@v1
+        uses: actions/upload-artifact@v4
         with:
-          name: index-management-plugin-${{ matrix.os }}
+          name: index-management-plugin-${{ matrix.os }}-${{ matrix.java }}
           path: index-management-artifacts