Skip to content

Commit

Permalink
Merge branch 'main' into bug-3204-race-conditions
Browse files Browse the repository at this point in the history
  • Loading branch information
DarshitChanpura committed Sep 13, 2023
2 parents 8fc02dc + 88f0272 commit 1e4afc8
Show file tree
Hide file tree
Showing 7 changed files with 17 additions and 17 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/auto-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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:
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/code-hygiene.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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/[email protected]
Expand All @@ -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:
Expand All @@ -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:
Expand All @@ -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:
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/integration-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/maven-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/plugin_install.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down

0 comments on commit 1e4afc8

Please sign in to comment.