Skip to content

Spark 3.3.0 support, gradle, and automate releasing all versions at once #168

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.

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
merged 15 commits into from
Jul 12, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
75 changes: 56 additions & 19 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,34 +3,71 @@ name: Build and test
on:
push:
branches: '*'
pull_request:
branches: '*'
# pull_request:
# branches: '*'

jobs:
build-scala-12:
build-all-versions:
strategy:
matrix:
scala: [ "2.12.15", "2.13.8" ]
spark: [ "3.3.0", "3.2.1", "3.2.0", "3.1.3", "3.1.2", "3.1.1", "3.1.0", "3.0.3", "3.0.2", "3.0.1", "3.0.0" ]
exclude:
- scala: "2.13.8"
spark: "3.1.3"
- scala: "2.13.8"
spark: "3.1.2"
- scala: "2.13.8"
spark: "3.1.1"
- scala: "2.13.8"
spark: "3.1.0"
- scala: "2.13.8"
spark: "3.0.3"
- scala: "2.13.8"
spark: "3.0.2"
- scala: "2.13.8"
spark: "3.0.1"
- scala: "2.13.8"
spark: "3.0.0"
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- name: Set up JDK 11
uses: actions/setup-java@v1
uses: actions/setup-java@v3
with:
distributions: adopt
distribution: adopt
java-version: 11
check-latest: true
- name: Cache Maven packages
uses: actions/cache@v2

- name: Cache Gradle packages
uses: actions/cache@v3
with:
path: |
~/.gradle/caches
~/.gradle/wrapper
~/.gradle/jdks
key: ${{ runner.os }}-gradle-spark-${{ matrix.spark }}-${{ matrix.scala }}
restore-keys: |
${{ runner.os }}-gradle-

- name: Build with Gradle
uses: gradle/gradle-build-action@v2
with:
path: ~/.m2
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
restore-keys: ${{ runner.os }}-m2
- name: Build with Maven
run: ./mvnw -B package --file pom.xml -Pscala-2.12
# qodana:
# runs-on: ubuntu-latest
# steps:
# - uses: actions/checkout@v3
# - name: 'Qodana Scan'
# uses: JetBrains/[email protected]
arguments: |
-Pspark=${{ matrix.spark }}
-Pscala=${{ matrix.scala }}
clean
build

# qodana:
# runs-on: ubuntu-latest
# steps:
# - uses: actions/checkout@v3
# - name: 'Qodana Scan'
# uses: JetBrains/[email protected]



# vim: ts=2:sts=2:sw=2:expandtab
31 changes: 24 additions & 7 deletions .github/workflows/generate_docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,28 +3,45 @@ name: Generate and publish docs
on:
push:
branches:
- "spark-3.2"
- "release" # todo make release branch

jobs:
generate-and-publish-docs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- name: Set up JDK 11
uses: actions/setup-java@v1
uses: actions/setup-java@v3
with:
distributions: adopt
distribution: adopt
java-version: 11
check-latest: true
- name: Generate docs
run: ./mvnw clean package site -Dmaven.test.skip=true

- name: Cache Gradle packages
uses: actions/cache@v3
with:
path: |
~/.gradle/caches
~/.gradle/wrapper
~/.gradle/jdks
key: ${{ runner.os }}-gradle-spark-${{ matrix.spark }}-${{ matrix.scala }}
restore-keys: |
${{ runner.os }}-gradle-

- name: Generate docs with Gradle
uses: gradle/gradle-build-action@v2
with:
arguments: |
dokkaHtmlMultiModule

- name: Copy docs to "docs" branch
uses: peaceiris/actions-gh-pages@v3
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
publish_branch: docs
publish_dir: ./kotlin-spark-api/3.2/target/dokka
publish_dir: ./build/dokka/htmlMultiModule
force_orphan: true


61 changes: 51 additions & 10 deletions .github/workflows/publish_dev_version.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,24 +7,65 @@ on:

jobs:
build-and-deploy:
strategy:
matrix:
scala: [ "2.12.15", "2.13.8" ]
spark: [ "3.3.0", "3.2.1", "3.2.0", "3.1.3", "3.1.2", "3.1.1", "3.1.0", "3.0.3", "3.0.2", "3.0.1", "3.0.0" ]
exclude:
- scala: "2.13.8"
spark: "3.1.3"
- scala: "2.13.8"
spark: "3.1.2"
- scala: "2.13.8"
spark: "3.1.1"
- scala: "2.13.8"
spark: "3.1.0"
- scala: "2.13.8"
spark: "3.0.3"
- scala: "2.13.8"
spark: "3.0.2"
- scala: "2.13.8"
spark: "3.0.1"
- scala: "2.13.8"
spark: "3.0.0"
runs-on: ubuntu-latest
permissions:
contents: read
packages: write

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- name: Set up JDK 11
uses: actions/setup-java@v1
uses: actions/setup-java@v3
with:
distributions: adopt
distribution: adopt
java-version: 11
check-latest: true
- name: Cache Maven packages
uses: actions/cache@v2

- name: Cache Gradle packages
uses: actions/cache@v3
with:
path: |
~/.gradle/caches
~/.gradle/wrapper
~/.gradle/jdks
key: ${{ runner.os }}-gradle-spark-${{ matrix.spark }}-${{ matrix.scala }}
restore-keys: |
${{ runner.os }}-gradle-

- name: Validate Gradle wrapper
uses: gradle/wrapper-validation-action@v1

- name: Deploy to GH Packages with Gradle
uses: gradle/gradle-build-action@v2
with:
path: ~/.m2
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
restore-keys: ${{ runner.os }}-m2
- name: Deploy to GH Packages
run: ./mvnw --batch-mode deploy
arguments: |
-Pspark=${{ matrix.spark }}
-Pscala=${{ matrix.scala }}
-PskipScalaTuplesInKotlin=${{ !(matrix.spark == '3.0.0' || matrix.scala == '2.13.8' && matrix.spark == '3.2.0') }}
clean
publishMavenPublicationToGitHubPackagesRepository
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -376,3 +376,4 @@ orcpath/
.env
**/.allure/
**/allure-results/
/generated_*
117 changes: 0 additions & 117 deletions .mvn/wrapper/MavenWrapperDownloader.java

This file was deleted.

2 changes: 0 additions & 2 deletions .mvn/wrapper/maven-wrapper.properties

This file was deleted.

Loading