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

Adjust asserts for Spark 3.4.0 snapshot #112

Merged
merged 4 commits into from
Sep 12, 2022
Merged

Adjust asserts for Spark 3.4.0 snapshot #112

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b1bae91
Adjust asserts for Spark 3.4.0 snapshot
EnricoMi Sep 12, 2022
35f71c9
Checkout code after restoring caches
EnricoMi Sep 12, 2022
111762d
Split compile and package steps
EnricoMi Sep 12, 2022
24a3ede
Revert "Checkout code after restoring caches"
EnricoMi Sep 12, 2022
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
4 changes: 3 additions & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,9 @@ jobs:
distribution: 'zulu'

- name: Build
run: mvn --batch-mode --update-snapshots compile test-compile package -DskipTests -Dmaven.test.skip=true
run: |
mvn --batch-mode --update-snapshots clean compile test-compile
mvn --batch-mode package -DskipTests -Dmaven.test.skip=true

- name: Upload Binaries
uses: actions/upload-artifact@v3
Expand Down
6 changes: 3 additions & 3 deletions src/test/scala/uk/co/gresearch/spark/HistogramSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ class HistogramSuite extends AnyFunSuite with SparkTestSession {
assert(
exception.getMessage.startsWith("cannot resolve '`does-not-exist`' given input columns: [id, title, value]") ||
exception.getMessage.startsWith("Column '`does-not-exist`' does not exist. Did you mean one of the following? [title, id, value]") ||
exception.getMessage.startsWith("[UNRESOLVED_COLUMN] A column or function parameter with name `does-not-exist` cannot be resolved. Did you mean one of the following? [`title`, `id`, `value`]")
exception.getMessage.startsWith("[UNRESOLVED_COLUMN.WITH_SUGGESTION] A column or function parameter with name `does-not-exist` cannot be resolved. Did you mean one of the following? [`title`, `id`, `value`]")
)
}

Expand All @@ -194,8 +194,8 @@ class HistogramSuite extends AnyFunSuite with SparkTestSession {
}
assert(
exception.getMessage.startsWith("cannot resolve '`does-not-exist`' given input columns: [") ||
exception.getMessage.startsWith("Column '`does-not-exist`' does not exist. Did you mean one of the following? [") ||
exception.getMessage.startsWith("[UNRESOLVED_COLUMN] A column or function parameter with name `does-not-exist` cannot be resolved. Did you mean one of the following? [")
exception.getMessage.startsWith("Column '`does-not-exist`' does not exist. Did you mean one of the following? [title, id, value, ≤-100, ≤-200, >200, ≤0, ≤100, ≤200]") ||
exception.getMessage.startsWith("[UNRESOLVED_COLUMN.WITH_SUGGESTION] A column or function parameter with name `does-not-exist` cannot be resolved. Did you mean one of the following? [`title`, `id`, `value`, `≤-100`, `≤-200`]")
)
}

Expand Down