This is an automated email from the ASF dual-hosted git repository.
agrove pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/datafusion-ballista.git
The following commit(s) were added to refs/heads/main by this push:
new 1b0235ee Fix Ballista rust.yml github workflow (#1026)
1b0235ee is described below
commit 1b0235ee33706805d4bb0fe2271dcd743a14fc24
Author: Raphaël Marinier <[email protected]>
AuthorDate: Fri Jun 21 18:07:40 2024 +0200
Fix Ballista rust.yml github workflow (#1026)
* Remove unused ExecutorsResponse. Also allowed an 'assigning_clones'.
This should fix the failing clippy job of the rust.yml workflow which
is currently failing:
https://github.com/apache/datafusion-ballista/actions/runs/9573013476/job/26393931712
* Fix the failing docker job in the rust.yml github workflow.
Example of failure:
https://github.com/apache/datafusion-ballista/actions/runs/9573013476/job/26393932135
* Add missing license header to rust-toolchain.toml
---
.github/workflows/rust.yml | 4 ++--
ballista-cli/src/exec.rs | 6 +++++-
ballista/scheduler/src/api/handlers.rs | 6 ------
rust-toolchain.toml | 17 +++++++++++++++++
4 files changed, 24 insertions(+), 9 deletions(-)
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index e15176df..3ad926f1 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -349,12 +349,12 @@ jobs:
uses: actions/download-artifact@v2
with:
name: rust-artifacts
- path: /home/runner/work/arrow-ballista/arrow-ballista/target/release
+ path: target/release
- name: Restore react artifacts
uses: actions/download-artifact@v2
with:
name: react-artifacts
- path:
/home/runner/work/arrow-ballista/arrow-ballista/ballista/scheduler/ui/build
+ path: ballista/scheduler/ui/build
- name: Build and push Docker image
run: |
echo "github user is $DOCKER_USER"
diff --git a/ballista-cli/src/exec.rs b/ballista-cli/src/exec.rs
index bd075b41..9101ca0b 100644
--- a/ballista-cli/src/exec.rs
+++ b/ballista-cli/src/exec.rs
@@ -53,7 +53,11 @@ pub async fn exec_from_lines(
Ok(_) => {}
Err(err) => println!("{err:?}"),
}
- query = "".to_owned();
+
+ #[allow(clippy::assigning_clones)]
+ {
+ query = "".to_owned();
+ }
} else {
query.push('\n');
}
diff --git a/ballista/scheduler/src/api/handlers.rs
b/ballista/scheduler/src/api/handlers.rs
index 0645147c..463ca217 100644
--- a/ballista/scheduler/src/api/handlers.rs
+++ b/ballista/scheduler/src/api/handlers.rs
@@ -32,12 +32,6 @@ struct SchedulerStateResponse {
started: u128,
version: &'static str,
}
-
-#[derive(Debug, serde::Serialize)]
-struct ExecutorsResponse {
- executors: Vec<ExecutorMetaResponse>,
-}
-
#[derive(Debug, serde::Serialize)]
pub struct ExecutorMetaResponse {
pub id: String,
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
index 292fe499..70b51cc7 100644
--- a/rust-toolchain.toml
+++ b/rust-toolchain.toml
@@ -1,2 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
[toolchain]
channel = "stable"
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
