Skip to content

Commit 4cc2a5b

Browse files
committed
Update to latest OpenRemote version
1 parent a3ea12d commit 4cc2a5b

File tree

3 files changed

+22
-7
lines changed

3 files changed

+22
-7
lines changed

.github/workflows/ci_cd.yml

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,17 @@ on:
55
# Push excluding tags and workflow changes
66
push:
77
branches:
8-
- '**'
8+
- 'main'
99
tags-ignore:
1010
- '*.*'
1111
paths-ignore:
1212
- '.github/**'
1313
- '.ci_cd/**'
1414
- '**/*.md'
1515

16+
# PR
17+
pull_request:
18+
1619
# When a release is published
1720
release:
1821
types: [published]
@@ -22,13 +25,15 @@ on:
2225
inputs:
2326
ENVIRONMENT:
2427
description: 'Environment to use (if any)'
25-
MANAGER_TAG:
26-
description: 'Manager docker tag to pull'
2728
CLEAN_INSTALL:
2829
description: 'Delete data before starting'
2930
type: boolean
3031
COMMIT:
3132
description: 'Repo branch or commit SHA to checkout'
33+
OR_HOSTNAME:
34+
description: 'Host to deploy to (e.g. demo.openremote.app)'
35+
OR_ADMIN_PASSWORD:
36+
description: 'Admin password override'
3237

3338
# Un-comment to monitor manager docker image tags for changes and trigger a redeploy when they change (see .ci_cd/README.md)
3439
# schedule:

build.gradle

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,17 @@
1+
// Configure version based on Git tags
2+
apply plugin: 'pl.allegro.tech.build.axion-release'
3+
scmVersion {
4+
releaseOnlyOnReleaseBranches = true
5+
releaseBranchNames = ['main']
6+
unshallowRepoOnCI.set(true)
7+
versionCreator('simple')
8+
repository {
9+
remote.set('origin')
10+
}
11+
tag {
12+
prefix.set('')
13+
}
14+
}
115

216
allprojects {
317
// Apply common project setup

project.gradle

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -337,10 +337,6 @@ tasks.register('npmBuild', Exec) {
337337
dependsOn getYarnInstallTask()
338338
commandLine npmCommand("yarn"), "run", "build"
339339
}
340-
tasks.register('npmTest', Exec) {
341-
dependsOn getYarnInstallTask()
342-
commandLine npmCommand("yarn"), "run", "test"
343-
}
344340
tasks.register('npmServe', Exec) {
345341
dependsOn getYarnInstallTask()
346342
commandLine npmCommand("yarn"), "run", "serve"

0 commit comments

Comments
 (0)