From 7fce2338350289c6c62242e15009584255ad7b2d Mon Sep 17 00:00:00 2001 From: Brandon Shien <44730413+bshien@users.noreply.github.com> Date: Tue, 3 Dec 2024 11:06:52 -0800 Subject: [PATCH] Update artifact action to v4 (#3183) Signed-off-by: Brandon Shien --- .github/workflows/bi-connectors.yml | 4 ++-- .github/workflows/dco.yml | 18 ------------------ .../sql-cli-test-and-build-workflow.yml | 2 +- .../sql-jdbc-test-and-build-workflow.yml | 2 +- .github/workflows/sql-odbc-main.yml | 14 +++++++------- .../workflows/sql-odbc-release-workflow.yml | 14 +++++++------- .../workflows/sql-test-and-build-workflow.yml | 4 ++-- 7 files changed, 20 insertions(+), 38 deletions(-) delete mode 100644 .github/workflows/dco.yml diff --git a/.github/workflows/bi-connectors.yml b/.github/workflows/bi-connectors.yml index 7e339967b0..bb0f9dd809 100644 --- a/.github/workflows/bi-connectors.yml +++ b/.github/workflows/bi-connectors.yml @@ -42,13 +42,13 @@ jobs: working-directory: bi-connectors/PowerBIConnector - name: Upload Tableau JDBC connector if: steps.pack-tableau-jdbc.outcome == 'success' - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: TableauConnectors path: bi-connectors/TableauConnector/opensearch_sql_jdbc/opensearch_sql_jdbc.taco - name: Upload Power BI ODBC connectors if: steps.pack-powerbi-odbc-os-proj.outcome == 'success' || (steps.prep-powerbi-odbc-amz-os-svc.outcome == 'success' && steps.pack-powerbi-odbc-amz-os-svc.outcome == 'success') - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: PBIConnectors path: 'bi-connectors/PowerBIConnector/*.mez' diff --git a/.github/workflows/dco.yml b/.github/workflows/dco.yml deleted file mode 100644 index 53ed5304c2..0000000000 --- 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/sql-cli-test-and-build-workflow.yml b/.github/workflows/sql-cli-test-and-build-workflow.yml index 3de1ff3aa5..a52d130486 100644 --- a/.github/workflows/sql-cli-test-and-build-workflow.yml +++ b/.github/workflows/sql-cli-test-and-build-workflow.yml @@ -57,7 +57,7 @@ jobs: cp -r ./dist/*.tar.gz ./dist/*.whl opensearchsql-builds/ - name: Upload Artifact - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: opensearchsql path: sql-cli/opensearchsql-builds diff --git a/.github/workflows/sql-jdbc-test-and-build-workflow.yml b/.github/workflows/sql-jdbc-test-and-build-workflow.yml index f32cfd9511..2e5320c8a1 100644 --- a/.github/workflows/sql-jdbc-test-and-build-workflow.yml +++ b/.github/workflows/sql-jdbc-test-and-build-workflow.yml @@ -27,7 +27,7 @@ jobs: cp ./build/libs/*.jar sql-jdbc-builds - name: Upload Artifacts - uses: actions/upload-artifact@v1 + uses: actions/upload-artifact@v4 with: name: sql-jdbc path: sql-jdbc/sql-jdbc-builds diff --git a/.github/workflows/sql-odbc-main.yml b/.github/workflows/sql-odbc-main.yml index 0a22780aa9..469e19794a 100644 --- a/.github/workflows/sql-odbc-main.yml +++ b/.github/workflows/sql-odbc-main.yml @@ -23,7 +23,7 @@ jobs: sh run_cppcheck.sh - name: upload-cppcheck-results if: failure() - uses: actions/upload-artifact@v1 + uses: actions/upload-artifact@v4 with: name: cppcheck-results path: sql-odbc/cppcheck-results.log @@ -61,13 +61,13 @@ jobs: # cp ./bin64/*.log test-output - name: upload-build if: success() - uses: actions/upload-artifact@v1 + uses: actions/upload-artifact@v4 with: name: mac64-build path: sql-odbc/build-output - name: upload-installer if: success() - uses: actions/upload-artifact@v1 + uses: actions/upload-artifact@v4 with: name: mac64-installer path: sql-odbc/installer @@ -106,13 +106,13 @@ jobs: .\scripts\prepare_ci_output.ps1 $Env:ODBC_BIN_PATH $Env:ODBC_LIB_PATH $Env:ODBC_BUILD_PATH - name: upload-build if: always() - uses: actions/upload-artifact@v1 + uses: actions/upload-artifact@v4 with: name: windows32-build path: sql-odbc/ci-output/build - name: upload-installer if: always() - uses: actions/upload-artifact@v1 + uses: actions/upload-artifact@v4 with: name: windows32-installer path: sql-odbc/ci-output/installer @@ -151,13 +151,13 @@ jobs: .\scripts\prepare_ci_output.ps1 $Env:ODBC_BIN_PATH $Env:ODBC_LIB_PATH $Env:ODBC_BUILD_PATH - name: upload-build if: always() - uses: actions/upload-artifact@v1 + uses: actions/upload-artifact@v4 with: name: windows64-build path: sql-odbc/ci-output/build - name: upload-installer if: always() - uses: actions/upload-artifact@v1 + uses: actions/upload-artifact@v4 with: name: windows64-installer path: sql-odbc/ci-output/installer diff --git a/.github/workflows/sql-odbc-release-workflow.yml b/.github/workflows/sql-odbc-release-workflow.yml index b929507c4b..f0ecb2124d 100644 --- a/.github/workflows/sql-odbc-release-workflow.yml +++ b/.github/workflows/sql-odbc-release-workflow.yml @@ -34,7 +34,7 @@ jobs: aws-region: us-east-1 - name: upload-cppcheck-results if: failure() - uses: actions/upload-artifact@v1 + uses: actions/upload-artifact@v4 with: name: cppcheck-results path: sql-odbc/cppcheck-results.log @@ -67,13 +67,13 @@ jobs: # cp $(ls -d bin64/* | grep -v "\.") build - name: upload-build if: success() - uses: actions/upload-artifact@v1 + uses: actions/upload-artifact@v4 with: name: mac64-build path: sql-odbc/build-output - name: upload-installer if: success() - uses: actions/upload-artifact@v1 + uses: actions/upload-artifact@v4 with: name: mac64-installer path: sql-odbc/installer @@ -124,13 +124,13 @@ jobs: .\scripts\prepare_ci_output.ps1 $Env:ODBC_BIN_PATH $Env:ODBC_LIB_PATH $Env:ODBC_BUILD_PATH - name: upload-build if: always() - uses: actions/upload-artifact@v1 + uses: actions/upload-artifact@v4 with: name: windows32-build path: sql-odbc/ci-output/build - name: upload-installer if: always() - uses: actions/upload-artifact@v1 + uses: actions/upload-artifact@v4 with: name: windows32-installer path: sql-odbc/ci-output/installer @@ -182,13 +182,13 @@ jobs: .\scripts\prepare_ci_output.ps1 $Env:ODBC_BIN_PATH $Env:ODBC_LIB_PATH $Env:ODBC_BUILD_PATH - name: upload-build if: always() - uses: actions/upload-artifact@v1 + uses: actions/upload-artifact@v4 with: name: windows64-build path: sql-odbc/ci-output/build - name: upload-installer if: always() - uses: actions/upload-artifact@v1 + uses: actions/upload-artifact@v4 with: name: windows64-installer path: sql-odbc/ci-output/installer diff --git a/.github/workflows/sql-test-and-build-workflow.yml b/.github/workflows/sql-test-and-build-workflow.yml index 3cf4af8ea7..bbb3c968aa 100644 --- a/.github/workflows/sql-test-and-build-workflow.yml +++ b/.github/workflows/sql-test-and-build-workflow.yml @@ -42,7 +42,7 @@ jobs: token: ${{ secrets.CODECOV_TOKEN }} - name: Upload Artifacts - uses: actions/upload-artifact@v1 + uses: actions/upload-artifact@v4 with: - name: opensearch-sql + name: opensearch-sql-${{ matrix.java }} path: opensearch-sql-builds