Skip to content

armgit / core

Public Imported from GitHub
0

100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps

CI fix (removed UI demo gradle projects and made test pipeline step only run tests)

Rich Turner2b700234c2a6
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 96886e7ac..4138f5e6c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -182,7 +182,7 @@ test-master:
/bin/sh -c "docker-compose -f profile/dev-testing.yml up --no-build -d"
script:
- docker run --network host -v $(pwd):/or "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG"
- /bin/sh -c "./gradlew clean build installDist"
+ /bin/sh -c "./gradlew clean test"
rules:
- if: $CI_COMMIT_BRANCH == "master"
if: $CI_COMMIT_MESSAGE !~ /skip-test/
diff --git a/ui/demo/demo-core/build.gradle b/ui/demo/demo-core/build.gradle
deleted file mode 100644
index 5f8fc3f9e..000000000
--- a/ui/demo/demo-core/build.gradle
+++ /dev/null
@@ -1,9 +0,0 @@
-buildDir = "dist"
-
-task clean() {
- dependsOn npmClean
-}
-
-task build() {
- dependsOn npmBuild
-}
\ No newline at end of file
diff --git a/ui/demo/demo-or-asset-tree/build.gradle b/ui/demo/demo-or-asset-tree/build.gradle
deleted file mode 100644
index 5f8fc3f9e..000000000
--- a/ui/demo/demo-or-asset-tree/build.gradle
+++ /dev/null
@@ -1,9 +0,0 @@
-buildDir = "dist"
-
-task clean() {
- dependsOn npmClean
-}
-
-task build() {
- dependsOn npmBuild
-}
\ No newline at end of file
diff --git a/ui/demo/demo-or-map/build.gradle b/ui/demo/demo-or-map/build.gradle
deleted file mode 100644
index 5f8fc3f9e..000000000
--- a/ui/demo/demo-or-map/build.gradle
+++ /dev/null
@@ -1,9 +0,0 @@
-buildDir = "dist"
-
-task clean() {
- dependsOn npmClean
-}
-
-task build() {
- dependsOn npmBuild
-}
\ No newline at end of file
diff --git a/ui/demo/demo-or-thermostat/build.gradle b/ui/demo/demo-or-thermostat/build.gradle
deleted file mode 100644
index 5f8fc3f9e..000000000
--- a/ui/demo/demo-or-thermostat/build.gradle
+++ /dev/null
@@ -1,9 +0,0 @@
-buildDir = "dist"
-
-task clean() {
- dependsOn npmClean
-}
-
-task build() {
- dependsOn npmBuild
-}
\ No newline at end of file
diff --git a/ui/demo/demo-rest/build.gradle b/ui/demo/demo-rest/build.gradle
deleted file mode 100644
index 5f8fc3f9e..000000000
--- a/ui/demo/demo-rest/build.gradle
+++ /dev/null
@@ -1,9 +0,0 @@
-buildDir = "dist"
-
-task clean() {
- dependsOn npmClean
-}
-
-task build() {
- dependsOn npmBuild
-}
\ No newline at end of file