Skip to content

Commit

Permalink
Merge pull request #44 from kameshsampath/next
Browse files Browse the repository at this point in the history
- left align button name/desc
- show toast on errors
- update examples
  • Loading branch information
kameshsampath committed Oct 6, 2022
2 parents 65c3d68 + 173b3c4 commit 3205cd5
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 7 deletions.
3 changes: 1 addition & 2 deletions backend/cmd/pipelines-finder/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ func main() {
log.Fatal(err)
}

//TODO use WalkDir
err = filepath.Walk(directory, func(path string, fi os.FileInfo, err error) error {
if err != nil {
fmt.Println(err)
Expand All @@ -47,8 +48,6 @@ func main() {
switch ignorable {
case ignore.Transitive:
return filepath.SkipDir
case ignore.Current:
return nil
}

// Chase symlinks.
Expand Down
4 changes: 3 additions & 1 deletion backend/scripts/run-drone.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#!/usr/bin/env bash
# TODO enable debugging
set -e

SCRIPT_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" &> /dev/null && pwd)

Expand All @@ -17,5 +18,6 @@ else
pushd "${PIPELINE_DIR}" &>/dev/null || true
DRONE_CMD=("${SCRIPT_DIR}/drone" "exec" "${@:1:$#-1}" "${PIPELINE_FILE_NAME}")
# printf "\n Command to be run %s\n" "${DRONE_CMD[*]}"
bash -c "${DRONE_CMD[*]}" || popd +1 &>/dev/null || true
bash -c "${DRONE_CMD[*]}"
popd +1 &>/dev/null || true
fi
2 changes: 0 additions & 2 deletions examples/hello-world/.drone.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,13 @@ steps:
image: kameshsampath/drone-java-maven-plugin:v1.0.3
pull: if-not-exists
settings:
maven_mirror_url: http://nexus:8081/repository/maven-public
goals:
- clean
- test
- name: package as jar
image: kameshsampath/drone-java-maven-plugin:v1.0.3
pull: if-not-exists
settings:
maven_mirror_url: http://nexus:8081/repository/maven-public
goals:
- clean
- install
Expand Down
1 change: 0 additions & 1 deletion ui/src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,6 @@ export function App() {
</Typography>
<Grid
container
spacing={2}
>
<Grid
item
Expand Down
5 changes: 4 additions & 1 deletion ui/src/components/dialogs/RunPipelineDialog.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -246,11 +246,14 @@ export default function RunPipelineDialog({ ...props }) {
}
once++;
},
onError(error) {
ddClient.desktopUI.toast.error(`Error running pipeline :${JSON.stringify(error)}`)
},
splitOutputLines: true
}
});
} catch (err) {
console.debug('Error %s', err);
ddClient.desktopUI.toast.error(`Error running pipeline :${JSON.stringify(err)}`)
} finally {
props.onClose();
}
Expand Down

0 comments on commit 3205cd5

Please sign in to comment.