Skip to content

Commit

Permalink
Merge pull request #540 from nimblehq/bug/538-fix-the-template-workfl…
Browse files Browse the repository at this point in the history
…ows-fail-to-run-due-to-incorrect-java-version

[#538] Update all workflows to use Java 17
  • Loading branch information
ryan-conway authored Oct 11, 2023
2 parents 1b3d92e + 082ad3e commit eb30932
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 28 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ jobs:
runs-on: ubuntu-latest
timeout-minutes: 30
steps:
- name: Set up JDK 11
- name: Set up JDK 17
uses: actions/setup-java@v3
with:
distribution: 'temurin'
java-version: '11'
java-version: '17'

- name: Set up timezone
uses: zcong1993/setup-timezone@master
Expand Down
4 changes: 2 additions & 2 deletions .cicdtemplate/.github/workflows/review_pull_request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ jobs:
runs-on: ubuntu-latest
timeout-minutes: 30
steps:
- name: Set up JDK 11
- name: Set up JDK 17
uses: actions/setup-java@v3
with:
distribution: 'temurin'
java-version: '11'
java-version: '17'

- name: Checkout source code
uses: actions/checkout@v4
Expand Down
4 changes: 2 additions & 2 deletions .cicdtemplate/.github/workflows/run_detekt_and_unit_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ jobs:
runs-on: ubuntu-latest
timeout-minutes: 30
steps:
- name: Set up JDK 11
- name: Set up JDK 17
uses: actions/setup-java@v3
with:
distribution: 'temurin'
java-version: '11'
java-version: '17'

- name: Set up timezone
uses: zcong1993/setup-timezone@master
Expand Down
10 changes: 2 additions & 8 deletions .github/workflows/review_pull_request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ jobs:
timeout-minutes: 30
environment: template-compose
steps:
- name: Set up JDK 11
- name: Set up JDK 17
uses: actions/setup-java@v3
with:
distribution: 'temurin'
java-version: '11'
java-version: '17'

- name: Checkout source code
uses: actions/checkout@v4
Expand Down Expand Up @@ -47,12 +47,6 @@ jobs:

# template-compose

- name: Set up JDK 17
uses: actions/setup-java@v3
with:
distribution: 'temurin'
java-version: '17'

- name: Run Detekt on template-compose
working-directory: ./template-compose
run: ./gradlew detekt
Expand Down
6 changes: 0 additions & 6 deletions .github/workflows/run_detekt_and_unit_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,12 +52,6 @@ jobs:

# template-xml

- name: Set up JDK 11
uses: actions/setup-java@v3
with:
distribution: 'temurin'
java-version: '11'

- name: Run Detekt on template-xml
working-directory: ./template-xml
run: ./gradlew detekt
Expand Down
10 changes: 2 additions & 8 deletions .github/workflows/verify_newproject_script.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ jobs:
runs-on: ubuntu-latest
timeout-minutes: 30
steps:
- name: Set up JDK 11
- name: Set up JDK 17
uses: actions/setup-java@v3
with:
distribution: 'temurin'
java-version: '11'
java-version: '17'

- name: Checkout source code
uses: actions/checkout@v4
Expand Down Expand Up @@ -44,12 +44,6 @@ jobs:
working-directory: scripts
run: kscript new_project.kts package-name=co.myxmlproject.example app-name="My XML Project" template=xml

- name: Set up JDK 17
uses: actions/setup-java@v3
with:
distribution: 'temurin'
java-version: '17'

- name: Verify generating new project from template-compose
working-directory: scripts
run: kscript new_project.kts package-name=co.mycomposeproject.example app-name="My Compose Project" template=compose
Expand Down

0 comments on commit eb30932

Please sign in to comment.