Skip to content

Commit ae0c410

Browse files
committed
Trying removing xvfb.
1 parent 6a75c5d commit ae0c410

File tree

4 files changed

+39
-5
lines changed

4 files changed

+39
-5
lines changed

.travis.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,6 @@ before_install:
1919
install:
2020
- nvm install 8.14.0
2121
- nvm use 8.14.0
22-
before_script:
23-
- "export DISPLAY=:99.0"
24-
- "sh -e /etc/init.d/xvfb start"
25-
- sleep 3
26-
- fluxbox > /dev/null 2>&1 &
2722
script:
2823
- dotnet restore -v q eFormAPI/eFormAPI.sln
2924
- dotnet build eFormAPI/eFormAPI.sln

eFormAPI/eFormAPI.Web/Services/TemplatesService.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -308,6 +308,7 @@ public OperationResult Deploy(DeployModel deployModel)
308308
foreach (var siteUId in sitesToBeRetractedFrom)
309309
{
310310
core.CaseDelete(deployModel.Id, siteUId);
311+
core.CaseDelete("123");
311312
}
312313

313314
return new OperationResult(true,

eFormAPI/eFormAPI.sln

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,10 @@ Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "InstallBundle", "Installati
3535
EndProject
3636
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "DevOps", "DevOps", "{6336CFAA-297B-4F55-94EF-5F4CC2D879A7}"
3737
EndProject
38+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MachineArea.Pn", "Plugins\MachineArea.Pn\MachineArea.Pn\MachineArea.Pn.csproj", "{BA9672E4-7874-4958-AA86-19D788B355E9}"
39+
EndProject
40+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Customers.Pn", "Plugins\Customers.Pn\Customers.Pn\Customers.Pn.csproj", "{0C910C3E-80B8-44CB-AC0A-75B057A99DF8}"
41+
EndProject
3842
Global
3943
GlobalSection(SolutionConfigurationPlatforms) = preSolution
4044
Debug|Any CPU = Debug|Any CPU
@@ -120,6 +124,30 @@ Global
120124
{B63F5F50-AA5B-4BC2-AC61-B2A94B62C042}.Release|x64.Build.0 = Release|x86
121125
{B63F5F50-AA5B-4BC2-AC61-B2A94B62C042}.Release|x86.ActiveCfg = Release|x86
122126
{B63F5F50-AA5B-4BC2-AC61-B2A94B62C042}.Release|x86.Build.0 = Release|x86
127+
{BA9672E4-7874-4958-AA86-19D788B355E9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
128+
{BA9672E4-7874-4958-AA86-19D788B355E9}.Debug|Any CPU.Build.0 = Debug|Any CPU
129+
{BA9672E4-7874-4958-AA86-19D788B355E9}.Debug|x64.ActiveCfg = Debug|Any CPU
130+
{BA9672E4-7874-4958-AA86-19D788B355E9}.Debug|x64.Build.0 = Debug|Any CPU
131+
{BA9672E4-7874-4958-AA86-19D788B355E9}.Debug|x86.ActiveCfg = Debug|Any CPU
132+
{BA9672E4-7874-4958-AA86-19D788B355E9}.Debug|x86.Build.0 = Debug|Any CPU
133+
{BA9672E4-7874-4958-AA86-19D788B355E9}.Release|Any CPU.ActiveCfg = Release|Any CPU
134+
{BA9672E4-7874-4958-AA86-19D788B355E9}.Release|Any CPU.Build.0 = Release|Any CPU
135+
{BA9672E4-7874-4958-AA86-19D788B355E9}.Release|x64.ActiveCfg = Release|Any CPU
136+
{BA9672E4-7874-4958-AA86-19D788B355E9}.Release|x64.Build.0 = Release|Any CPU
137+
{BA9672E4-7874-4958-AA86-19D788B355E9}.Release|x86.ActiveCfg = Release|Any CPU
138+
{BA9672E4-7874-4958-AA86-19D788B355E9}.Release|x86.Build.0 = Release|Any CPU
139+
{0C910C3E-80B8-44CB-AC0A-75B057A99DF8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
140+
{0C910C3E-80B8-44CB-AC0A-75B057A99DF8}.Debug|Any CPU.Build.0 = Debug|Any CPU
141+
{0C910C3E-80B8-44CB-AC0A-75B057A99DF8}.Debug|x64.ActiveCfg = Debug|Any CPU
142+
{0C910C3E-80B8-44CB-AC0A-75B057A99DF8}.Debug|x64.Build.0 = Debug|Any CPU
143+
{0C910C3E-80B8-44CB-AC0A-75B057A99DF8}.Debug|x86.ActiveCfg = Debug|Any CPU
144+
{0C910C3E-80B8-44CB-AC0A-75B057A99DF8}.Debug|x86.Build.0 = Debug|Any CPU
145+
{0C910C3E-80B8-44CB-AC0A-75B057A99DF8}.Release|Any CPU.ActiveCfg = Release|Any CPU
146+
{0C910C3E-80B8-44CB-AC0A-75B057A99DF8}.Release|Any CPU.Build.0 = Release|Any CPU
147+
{0C910C3E-80B8-44CB-AC0A-75B057A99DF8}.Release|x64.ActiveCfg = Release|Any CPU
148+
{0C910C3E-80B8-44CB-AC0A-75B057A99DF8}.Release|x64.Build.0 = Release|Any CPU
149+
{0C910C3E-80B8-44CB-AC0A-75B057A99DF8}.Release|x86.ActiveCfg = Release|Any CPU
150+
{0C910C3E-80B8-44CB-AC0A-75B057A99DF8}.Release|x86.Build.0 = Release|Any CPU
123151
EndGlobalSection
124152
GlobalSection(SolutionProperties) = preSolution
125153
HideSolutionNode = FALSE

eform-client/src/app/plugins/plugins.routing.ts

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,16 @@ import {RouterModule, Routes} from '@angular/router';
33
import {AuthGuard} from 'src/app/common/guards';
44

55
export const routes: Routes = [
6+
{
7+
path: "machine-area-pn",
8+
canActivate: [AuthGuard],
9+
loadChildren: "./modules/machine-area-pn/machine-area-pn.module#MachineAreaPnModule"
10+
},
11+
{
12+
path: "customers-pn",
13+
canActivate: [AuthGuard],
14+
loadChildren: "./modules/customers-pn/customers-pn.module#CustomersPnModule"
15+
}
616
// INSERT ROUTES HERE
717
];
818

0 commit comments

Comments
 (0)