8000 Place Java setup in re-usable workflow file by jonkoops · Pull Request #17541 · keycloak/keycloak · GitHub
[go: up one dir, main page]
Skip to content

Place Java setup in re-usable workflow file #17541

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
stianst merged 2 commits into from
Jul 26, 2023
Merged

Place Java setup in re-usable workflow file #17541

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4cd3496
Place Java setup in re-usable workflow file
jonkoops Mar 9, 2023
2a13036
Merge branch 'main' into reusable-java-setup
stianst Jul 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 3 additions & 14 deletions .github/actions/build-keycloak/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,29 +5,18 @@ inputs:
upload-m2-repo:
description: Upload Maven repository for org.keycloak artifacts
required: false
default: true
default: "true"
upload-dist:
description: Upload distribution
required: false
default: false
jdk-dist:
description: JDK distribution
required: false
default: temurin
jdk-version:
description: JDK version
required: false
default: 17
default: "false"

runs:
using: composite
steps:
- id: setup-java
name: Setup Java
uses: actions/setup-java@v3
with:
distribution: ${{ inputs.jdk-dist }}
java-version: ${{ inputs.jdk-version }}
uses: ./.github/actions/java-setup

- id: maven-cache
name: Maven cache
Expand Down
4 changes: 2 additions & 2 deletions .github/actions/integration-test-setup/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@ inputs:
jdk-version:
description: JDK version
required: false
default: 17
default: "17"
Comment thread
stianst marked this conversation as resolved.
Resolved

runs:
using: composite
steps:
- id: setup-java
name: Setup Java
uses: actions/setup-java@v3
uses: ./.github/actions/java-setup
with:
distribution: ${{ inputs.jdk-dist }}
java-version: ${{ inputs.jdk-version }}
Expand Down
22 changes: 22 additions & 0 deletions .github/actions/java-setup/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
name: Setup Java
description: Sets up Java.

inputs:
distribution:
description: Java distribution.
required: false
default: temurin
java-version:
description: The Java version that is going to be set up.
required: false
default: "17"

runs:
using: composite
steps:
- id: setup-java
name: Setup Java
uses: actions/setup-java@v3
with:
distribution: ${{ inputs.distribution }}
java-version: ${{ inputs.java-version }}
18 changes: 2 additions & 16 deletions .github/actions/unit-test-setup/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,11 @@
name: Setup unit test
description: Download Maven caches needed for unit tests

inputs:
jdk-dist:
description: JDK distribution
required: false
default: temurin
jdk-version:
description: JDK version
required: false
default: 17

runs:
using: composite
steps:
- id: setup-java
name: Setup Java
uses: actions/setup-java@v3
with:
distribution: ${{ inputs.jdk-dist }}
java-version: ${{ inputs.jdk-version }}
- name: Setup Java
uses: ./.github/actions/java-setup

- id: maven-cache
name: Maven cache
Expand Down
4 changes: 0 additions & 4 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@ on:
workflow_dispatch:

env:
DEFAULT_JDK_VERSION: 17
DEFAULT_JDK_DIST: temurin
SUREFIRE_RERUN_FAILING_COUNT: 2

concurrency:
Expand Down Expand Up @@ -357,8 +355,6 @@ jobs:
- id: unit-test-setup
name: Unit test setup
uses: ./.github/actions/unit-test-setup
with:
jdk-version: 17

- name: Run crypto tests
run: docker run --rm --workdir /github/workspace -v "${{ github.workspace }}":"/github/workspace" -v "$HOME/.m2":"/root/.m2" registry.access.redhat.com/ubi8/ubi:latest .github/scripts/run-fips-ut.sh
Expand Down
14 changes: 2 additions & 12 deletions .github/workflows/documentation.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,6 @@ on:
pull_request:
workflow_dispatch:

env:
DEFAULT_JDK_VERSION: 17
DEFAULT_JDK_DIST: temurin

concurrency:
# Only cancel jobs for PR updates
group: documentation-${{ github.head_ref || github.run_id }}
Expand Down Expand Up @@ -46,10 +42,7 @@ jobs:

- id: setup-java
name: Setup Java
uses: actions/setup-java@v3
with:
distribution: ${{ env.DEFAULT_JDK_DIST }}
java-version: ${{ env.DEFAULT_JDK_VERSION }}
uses: ./.github/actions/java-setup

- id: maven-cache
name: Maven cache
Expand Down Expand Up @@ -86,10 +79,7 @@ jobs:

- id: setup-java
name: Setup Java
uses: actions/setup-java@v3
with:
distribution: ${{ env.DEFAULT_JDK_DIST }}
java-version: ${{ env.DEFAULT_JDK_VERSION }}
uses: ./.github/actions/java-setup

- id: maven-cache
name: Maven cache
Expand Down
4 changes: 0 additions & 4 deletions .github/workflows/guides.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,6 @@ on:
pull_request:
workflow_dispatch:

env:
DEFAULT_JDK_VERSION: 17
DEFAULT_JDK_DIST: temurin

concurrency:
# Only cancel jobs for PR updates
group: guides-${{ github.head_ref || github.run_id }}
Expand Down
20 changes: 6 additions & 14 deletions .github/workflows/operator-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@ on:
workflow_dispatch:

env:
DEFAULT_JDK_VERSION: 17
DEFAULT_JDK_DIST: temurin
MINIKUBE_VERSION: v1.28.0
KUBERNETES_VERSION: v1.22.3

Expand Down Expand Up @@ -63,10 +61,8 @@ jobs:
id: vars
run: echo "version_local=0.0.1-${GITHUB_SHA::6}" >> $GITHUB_ENV

- uses: actions/setup-java@v3
with:
distribution: ${{ env.DEFAULT_JDK_DIST }}
java-version: ${{ env.DEFAULT_JDK_VERSION }}
- name: Setup Java
uses: ./.github/actions/java-setup

- name: Setup Minikube-Kubernetes
uses: manusa/actions-setup-minikube@v2.7.2
Expand Down Expand Up @@ -110,10 +106,8 @@ jobs:
id: vars
run: echo "version_remote=0.0.1-${GITHUB_SHA::6}" >> $GITHUB_ENV

- uses: actions/setup-java@v3
with:
distribution: ${{ env.DEFAULT_JDK_DIST }}
java-version: ${{ env.DEFAULT_JDK_VERSION }}
- name: Setup Java
uses: ./.github/actions/java-setup

- name: Setup Minikube-Kubernetes
uses: manusa/actions-setup-minikube@v2.7.2
Expand Down Expand Up @@ -156,10 +150,8 @@ jobs:
steps:
- uses: actions/checkout@v3

- uses: actions/setup-java@v3
with:
distribution: ${{ env.DEFAULT_JDK_DIST }}
java-version: ${{ env.DEFAULT_JDK_VERSION }}
- name: Setup Java
uses: ./.github/actions/java-setup

- name: Setup Minikube-Kubernetes
uses: manusa/actions-setup-minikube@v2.7.2
Expand Down
0