Skip to content

Commit

Permalink
Merge pull request #321 from Aiven-Open/jjaakola-aiven-update-java-ve…
Browse files Browse the repository at this point in the history
…rsion-and-action-plugin-versions

Update java version and action plugin versions
  • Loading branch information
eliax1996 authored May 6, 2024
2 parents 42a0af8 + bdb367a commit 084041a
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 15 deletions.
13 changes: 7 additions & 6 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,11 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v2
uses: actions/checkout@v4

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v2
uses: github/codeql-action/init@v3
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
Expand All @@ -67,13 +67,14 @@ jobs:
#- run: |
# make bootstrap
# make release
- name: Set up JDK 11
uses: actions/setup-java@v1
- name: Set up JDK 17
uses: actions/setup-java@v2
with:
java-version: 11
distribution: "temurin"
java-version: 17

- name: Build with Gradle
run: ./gradlew build

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
uses: github/codeql-action/analyze@v3
7 changes: 4 additions & 3 deletions .github/workflows/create_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,13 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Setup Java SDK
uses: actions/setup-java@v1.4.3
uses: actions/setup-java@v2
with:
java-version: 11
distribution: "temurin"
java-version: 17

- name: Checkout code
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
ref: ${{ github.event.inputs.commit_hash }}

Expand Down
9 changes: 5 additions & 4 deletions .github/workflows/master_push_workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,13 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Set up JDK 11
uses: actions/setup-java@v1
- name: Set up JDK 17
uses: actions/setup-java@v2
with:
java-version: 11
distribution: "temurin"
java-version: 17
- name: Build with Gradle
run: ./gradlew build integrationTest
5 changes: 3 additions & 2 deletions .github/workflows/pull_request_workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,11 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v2
uses: actions/checkout@v4
- name: Set up JDK 17
uses: actions/setup-java@v1
uses: actions/setup-java@v2
with:
distribution: "temurin"
java-version: 17
- name: Build with Gradle
run: ./gradlew build integrationTest

0 comments on commit 084041a

Please sign in to comment.