From 6d78bce0de6b19b6d55b89eb1a9465c3c6079edb Mon Sep 17 00:00:00 2001 From: Peter Nied Date: Wed, 13 Sep 2023 09:25:30 -0500 Subject: [PATCH 1/3] Disable codecov from failing CI if there is an upload issue (#3353) ### Description Seeing a ton of CI failures due to code coverage upload failures. I'd like to fix this - but I'd rather keep the builds flowing in until we have a better solution. E.g: https://github.com/opensearch-project/security/actions/runs/6153593099/job/16697726519?pr=3339 - Related https://github.com/opensearch-project/security/issues/2649 ### Check List - [ ] New functionality includes testing - [ ] New functionality has been documented - [X] Commits are signed per the DCO using --signoff By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license. For more information on following Developer Certificate of Origin and signing off your commits, please check [here](https://github.com/opensearch-project/OpenSearch/blob/main/CONTRIBUTING.md#developer-certificate-of-origin). Signed-off-by: Peter Nied --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f6f9aa66d3..71a4bd1b00 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -67,7 +67,7 @@ jobs: action: codecov/codecov-action@v3 with: | token: ${{ secrets.CODECOV_TOKEN }} - fail_ci_if_error: true + fail_ci_if_error: false files: ./build/reports/jacoco/test/jacocoTestReport.xml - uses: actions/upload-artifact@v3 From 1c0a0505851bcbffb0f85143e44b802debaebb07 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 13 Sep 2023 09:45:21 -0500 Subject: [PATCH 2/3] dependabot: bump org.springframework.kafka:spring-kafka-test from 2.9.11 to 2.9.12 (#3341) Bumps [org.springframework.kafka:spring-kafka-test](https://github.com/spring-projects/spring-kafka) from 2.9.11 to 2.9.12. Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 37fcf5f4a1..327831c9fe 100644 --- a/build.gradle +++ b/build.gradle @@ -592,7 +592,7 @@ dependencies { testImplementation "org.apache.kafka:kafka-group-coordinator:${kafka_version}" testImplementation "org.apache.kafka:kafka_2.13:${kafka_version}:test" testImplementation "org.apache.kafka:kafka-clients:${kafka_version}:test" - testImplementation 'org.springframework.kafka:spring-kafka-test:2.9.11' + testImplementation 'org.springframework.kafka:spring-kafka-test:2.9.12' testImplementation 'org.springframework:spring-beans:5.3.20' testImplementation 'org.junit.jupiter:junit-jupiter:5.10.0' testImplementation 'org.junit.jupiter:junit-jupiter-api:5.10.0' From 88f0272ef971cda93500a5be9b12aa58689ebaac Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 13 Sep 2023 09:45:36 -0500 Subject: [PATCH 3/3] dependabot: bump actions/checkout from 3 to 4 (#3340) Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 4. Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/auto-release.yml | 2 +- .github/workflows/ci.yml | 12 ++++++------ .github/workflows/code-hygiene.yml | 10 +++++----- .github/workflows/integration-tests.yml | 2 +- .github/workflows/maven-publish.yml | 2 +- .github/workflows/plugin_install.yml | 2 +- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.github/workflows/auto-release.yml b/.github/workflows/auto-release.yml index ca0a797f42..7a3a250ba0 100644 --- a/.github/workflows/auto-release.yml +++ b/.github/workflows/auto-release.yml @@ -21,7 +21,7 @@ jobs: - name: Get tag id: tag uses: dawidd6/action-get-tag@v1 - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: ncipollo/release-action@v1 with: github_token: ${{ steps.github_app_token.outputs.token }} diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 71a4bd1b00..d5d5e3430d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -24,7 +24,7 @@ jobs: java-version: 17 - name: Checkout security - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Generate list of tasks id: set-matrix @@ -50,7 +50,7 @@ jobs: java-version: ${{ matrix.jdk }} - name: Checkout security - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Build and Test uses: gradle/gradle-build-action@v2 @@ -98,7 +98,7 @@ jobs: java-version: ${{ matrix.jdk }} - name: Checkout security - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Build and Test uses: gradle/gradle-build-action@v2 @@ -123,7 +123,7 @@ jobs: java-version: ${{ matrix.jdk }} - name: Checkout Security Repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 - id: build-previous uses: ./.github/actions/run-bwc-suite @@ -137,7 +137,7 @@ jobs: code-ql: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: actions/setup-java@v3 with: distribution: temurin # Temurin is a distribution of adoptium @@ -151,7 +151,7 @@ jobs: build-artifact-names: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: actions/setup-java@v3 with: diff --git a/.github/workflows/code-hygiene.yml b/.github/workflows/code-hygiene.yml index f4b39f9562..7aca45f064 100644 --- a/.github/workflows/code-hygiene.yml +++ b/.github/workflows/code-hygiene.yml @@ -8,7 +8,7 @@ jobs: name: Check if all files end in newline steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Linelint uses: fernandrone/linelint@0.0.6 @@ -17,7 +17,7 @@ jobs: runs-on: ubuntu-latest name: Spotless scan steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: actions/setup-java@v3 with: @@ -33,7 +33,7 @@ jobs: runs-on: ubuntu-latest name: Checkstyle scan steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: actions/setup-java@v3 with: @@ -49,7 +49,7 @@ jobs: runs-on: ubuntu-latest name: Spotbugs scan steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: actions/setup-java@v3 with: @@ -65,7 +65,7 @@ jobs: runs-on: ubuntu-latest name: Check permissions orders steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - run: npm install yaml - name: Check permissions order diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index 201cbe3491..eb11d0e478 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -20,7 +20,7 @@ jobs: distribution: temurin # Temurin is a distribution of adoptium java-version: ${{ matrix.jdk }} - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - run: OPENDISTRO_SECURITY_TEST_OPENSSL_OPT=true ./gradlew test diff --git a/.github/workflows/maven-publish.yml b/.github/workflows/maven-publish.yml index ad10199ad0..ac0e714674 100644 --- a/.github/workflows/maven-publish.yml +++ b/.github/workflows/maven-publish.yml @@ -21,7 +21,7 @@ jobs: with: distribution: temurin # Temurin is a distribution of adoptium java-version: 11 - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: aws-actions/configure-aws-credentials@v3 with: role-to-assume: ${{ secrets.PUBLISH_SNAPSHOTS_ROLE }} diff --git a/.github/workflows/plugin_install.yml b/.github/workflows/plugin_install.yml index dc598d79a0..5bfce0248b 100644 --- a/.github/workflows/plugin_install.yml +++ b/.github/workflows/plugin_install.yml @@ -23,7 +23,7 @@ jobs: java-version: ${{ matrix.jdk }} - name: Checkout Branch - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Assemble target plugin uses: gradle/gradle-build-action@v2