Skip to content
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

Jump to bottom

Switch testing to JDK17 #188

Draft
wants to merge 7 commits into
base: main
Choose a base branch
from
Draft

Switch testing to JDK17 #188

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5049a6a
Switch testing to JDK17
colindean Apr 10, 2024
945970a
Use adoptium, new name from adopt
colindean Apr 10, 2024
a1b6588
Adds MODERN_JAVA flag now that we're on a modern JDK
colindean Apr 10, 2024
7664368
Continue testing on JDK1.8 for legacy DV on Spark 2.3
colindean Apr 10, 2024
e6f029a
Separate legacy and modern steps into separate jobs
colindean Apr 10, 2024
0978a94
Build only for push events
colindean Apr 10, 2024
4aefbc7
Uppercase true because that's what's the check is
colindean Apr 10, 2024
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
24 changes: 18 additions & 6 deletions .github/workflows/ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,15 @@ name: Continuous Integration

on:
workflow_call:
pull_request:
branches: ['*']
push:
branches: ['*']

env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

jobs:
build:
name: Build and Test
build-legacy:
name: Build and Test on legacy JDK and Spark
runs-on: ubuntu-latest
steps:
- name: Checkout current branch (full)
Expand All @@ -23,7 +21,21 @@ jobs:
- uses: coursier/setup-action@v1
with:
jvm: adopt:1.8
- name: Build, test, and package project on "legacy" Spark
run: bin/sbt clean compile test package makePom
build-modern:
name: Build and Test on Modern JDK and Spark
runs-on: ubuntu-latest
steps:
- name: Checkout current branch (full)
uses: actions/checkout@v4
- uses: coursier/cache-action@v6
with:
extraKey: ${{ runner.os }}
- uses: coursier/setup-action@v1
with:
jvm: adoptium:1.17
- name: Build, test, and package project on Spark 3.5
run: bin/sbt clean compile test package makePom -DsparkVersion=3.5.1
- name: Build and package project on "legacy" Spark
run: bin/sbt clean compile package makePom
env:
MODERN_JAVA: TRUE
20 changes: 17 additions & 3 deletions .github/workflows/release.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

jobs:
deploy:
deploy-legacy:
name: Release
runs-on: ubuntu-latest
steps:
Expand All @@ -23,7 +23,21 @@ jobs:
with:
jvm: adopt:1.8
# uses sbt-github-packages, see build.sbt
- name: Publish with SBT
- name: Publish for Spark 2 / Scala 2.11 with SBT
run: bin/sbt publish
- name: Publish with SBT
deploy-modern:
name: Release
runs-on: ubuntu-latest
steps:
- name: Checkout current branch (full)
uses: actions/checkout@v4
- uses: coursier/cache-action@v6
with:
extraKey: ${{ runner.os }}
- uses: coursier/setup-action@v1
with:
jvm: adoptium:1.17
- name: Publish for Spark 3 / Scala 2.12 with SBT
run: bin/sbt publish -DsparkVersion=3.5.1
env:
MODERN_JAVA: TRUE
2 changes: 1 addition & 1 deletion .github/workflows/scala-steward.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: '11'
java-version: '17'
- name: Launch Scala Steward
uses: scala-steward-org/scala-steward-action@v2
with:
Expand Down
Loading