Skip to content

Commit 8c41340

Browse files
renemadsenrenemadsen
committedApr 17, 2023
Fixing angular 14 build.
·
v1.1.238v1.1.114
1 parent 16298b3 commit 8c41340

7 files changed

+51
-47
lines changed
 

‎.github/workflows/dotnet-core-master.yml

+18-19
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: .NET Master
22

33
on:
44
push:
5-
branches: [ master, stable, angular13 ]
5+
branches: [ master, stable, angular14 ]
66
paths-ignore:
77
- '**.md'
88
- '.github/**'
@@ -30,8 +30,8 @@ jobs:
3030
cp -av eform-angular-workflow-plugin/eform-client/e2e/Tests/workflow-settings eform-angular-frontend/eform-client/e2e/Tests/workflow-settings
3131
cp -av eform-angular-workflow-plugin/eform-client/e2e/Tests/workflow-general eform-angular-frontend/eform-client/e2e/Tests/workflow-general
3232
cp -av eform-angular-workflow-plugin/eform-client/e2e/Page\ objects/Workflow eform-angular-frontend/eform-client/e2e/Page\ objects/Workflow
33-
cp -av eform-angular-workflow-plugin/eform-client/wdio-headless-plugin-step2.conf.js eform-angular-frontend/eform-client/wdio-headless-plugin-step2.conf.js
34-
cp -av eform-angular-workflow-plugin/eform-client/wdio-plugin-step2.conf.js eform-angular-frontend/eform-client/wdio-plugin-step2.conf.js
33+
cp -av eform-angular-workflow-plugin/eform-client/wdio-headless-plugin-step2.conf.ts eform-angular-frontend/eform-client/wdio-headless-plugin-step2.conf.ts
34+
cp -av eform-angular-workflow-plugin/eform-client/wdio-plugin-step2.conf.ts eform-angular-frontend/eform-client/wdio-plugin-step2.conf.ts
3535
mkdir -p eform-angular-frontend/eFormAPI/eFormAPI.Web/Plugins
3636
cd eform-angular-frontend/eform-client && ../../eform-angular-workflow-plugin/testinginstallpn.sh
3737
- name: Get the version release
@@ -82,15 +82,6 @@ jobs:
8282
repository: microting/eform-angular-frontend
8383
ref: ${{ steps.extract_branch.outputs.branch }}
8484
path: eform-angular-frontend
85-
- name: Cache node_modules
86-
id: cache
87-
uses: actions/cache@v3
88-
with:
89-
path: eform-angular-frontend/eform-client/node_modules
90-
key: ${{ runner.os }}-build-${{ hashFiles('eform-angular-frontend/eform-client/package.json') }}
91-
restore-keys: |
92-
${{ runner.os }}-build-
93-
${{ runner.os }}-
9485
- name: Sleep 15 seconds
9586
run: sleep 15
9687
- name: Load DB dump
@@ -103,8 +94,8 @@ jobs:
10394
cp -av eform-angular-workflow-plugin/eform-client/e2e/Tests/workflow-settings eform-angular-frontend/eform-client/e2e/Tests/workflow-settings
10495
cp -av eform-angular-workflow-plugin/eform-client/e2e/Tests/workflow-general eform-angular-frontend/eform-client/e2e/Tests/workflow-general
10596
cp -av eform-angular-workflow-plugin/eform-client/e2e/Page\ objects/Workflow eform-angular-frontend/eform-client/e2e/Page\ objects/Workflow
106-
cp -av eform-angular-workflow-plugin/eform-client/wdio-headless-plugin-step2.conf.js eform-angular-frontend/eform-client/wdio-headless-plugin-step2.conf.js
107-
cp -av eform-angular-workflow-plugin/eform-client/wdio-plugin-step2.conf.js eform-angular-frontend/eform-client/wdio-plugin-step2.conf.js
97+
cp -av eform-angular-workflow-plugin/eform-client/wdio-headless-plugin-step2.conf.ts eform-angular-frontend/eform-client/wdio-headless-plugin-step2.conf.ts
98+
cp -av eform-angular-workflow-plugin/eform-client/wdio-plugin-step2.conf.ts eform-angular-frontend/eform-client/wdio-plugin-step2.conf.ts
10899
mkdir -p eform-angular-frontend/eFormAPI/eFormAPI.Web/Plugins
109100
cd eform-angular-frontend/eform-client && ../../eform-angular-workflow-plugin/testinginstallpn.sh
110101
- name: Start the newly build Docker container
@@ -116,11 +107,19 @@ jobs:
116107
run: cat docker_run_log
117108
- name: Pretest changes to work with Docker container
118109
run: sed -i 's/localhost/mariadbtest/g' eform-angular-frontend/eform-client/e2e/Constants/DatabaseConfigurationConstants.ts
119-
- name: NPM install
120-
run: cd eform-angular-frontend/eform-client && npm install
121-
if: steps.cache.outputs.cache-hit != 'true'
122-
- name: Configuration testing
123-
run: cd eform-angular-frontend/eform-client && npm run testheadless
110+
- name: yarn install
111+
run: cd eform-angular-frontend/eform-client && yarn install
112+
- name: DB Configuration
113+
uses: cypress-io/github-action@v4
114+
with:
115+
start: echo 'hi'
116+
wait-on: "http://localhost:4200"
117+
wait-on-timeout: 120
118+
browser: chrome
119+
record: false
120+
spec: cypress/e2e/db/*
121+
config-file: cypress.config.ts
122+
working-directory: eform-angular-frontend/eform-client
124123
- name: Change rabbitmq hostname
125124
run: docker exec -i mariadbtest mysql -u root --password=secretpassword -e 'update 420_SDK.Settings set Value = "my-rabbit" where Name = "rabbitMqHost"'
126125
- name: Plugin testing

‎.github/workflows/dotnet-core-pr.yml

+18-19
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: .NET Pull requests
22

33
on:
44
pull_request:
5-
branches: [ master, stable, angular13 ]
5+
branches: [ master, stable, angular14 ]
66
paths-ignore:
77
- '**.md'
88
- '.github/**'
@@ -30,8 +30,8 @@ jobs:
3030
cp -av eform-angular-workflow-plugin/eform-client/e2e/Tests/workflow-settings eform-angular-frontend/eform-client/e2e/Tests/workflow-settings
3131
cp -av eform-angular-workflow-plugin/eform-client/e2e/Tests/workflow-general eform-angular-frontend/eform-client/e2e/Tests/workflow-general
3232
cp -av eform-angular-workflow-plugin/eform-client/e2e/Page\ objects/Workflow eform-angular-frontend/eform-client/e2e/Page\ objects/Workflow
33-
cp -av eform-angular-workflow-plugin/eform-client/wdio-headless-plugin-step2.conf.js eform-angular-frontend/eform-client/wdio-headless-plugin-step2.conf.js
34-
cp -av eform-angular-workflow-plugin/eform-client/wdio-plugin-step2.conf.js eform-angular-frontend/eform-client/wdio-plugin-step2.conf.js
33+
cp -av eform-angular-workflow-plugin/eform-client/wdio-headless-plugin-step2.conf.ts eform-angular-frontend/eform-client/wdio-headless-plugin-step2.conf.ts
34+
cp -av eform-angular-workflow-plugin/eform-client/wdio-plugin-step2.conf.ts eform-angular-frontend/eform-client/wdio-plugin-step2.conf.ts
3535
mkdir -p eform-angular-frontend/eFormAPI/eFormAPI.Web/Plugins
3636
cd eform-angular-frontend/eform-client && ../../eform-angular-workflow-plugin/testinginstallpn.sh
3737
- name: Get the version release
@@ -82,15 +82,6 @@ jobs:
8282
repository: microting/eform-angular-frontend
8383
ref: ${{ steps.extract_branch.outputs.branch }}
8484
path: eform-angular-frontend
85-
- name: Cache node_modules
86-
id: cache
87-
uses: actions/cache@v3
88-
with:
89-
path: eform-angular-frontend/eform-client/node_modules
90-
key: ${{ runner.os }}-build-${{ hashFiles('eform-angular-frontend/eform-client/package.json') }}
91-
restore-keys: |
92-
${{ runner.os }}-build-
93-
${{ runner.os }}-
9485
- name: Sleep 15 seconds
9586
run: sleep 15
9687
- name: Load DB dump
@@ -103,8 +94,8 @@ jobs:
10394
cp -av eform-angular-workflow-plugin/eform-client/e2e/Tests/workflow-settings eform-angular-frontend/eform-client/e2e/Tests/workflow-settings
10495
cp -av eform-angular-workflow-plugin/eform-client/e2e/Tests/workflow-general eform-angular-frontend/eform-client/e2e/Tests/workflow-general
10596
cp -av eform-angular-workflow-plugin/eform-client/e2e/Page\ objects/Workflow eform-angular-frontend/eform-client/e2e/Page\ objects/Workflow
106-
cp -av eform-angular-workflow-plugin/eform-client/wdio-headless-plugin-step2.conf.js eform-angular-frontend/eform-client/wdio-headless-plugin-step2.conf.js
107-
cp -av eform-angular-workflow-plugin/eform-client/wdio-plugin-step2.conf.js eform-angular-frontend/eform-client/wdio-plugin-step2.conf.js
97+
cp -av eform-angular-workflow-plugin/eform-client/wdio-headless-plugin-step2.conf.ts eform-angular-frontend/eform-client/wdio-headless-plugin-step2.conf.ts
98+
cp -av eform-angular-workflow-plugin/eform-client/wdio-plugin-step2.conf.ts eform-angular-frontend/eform-client/wdio-plugin-step2.conf.ts
10899
mkdir -p eform-angular-frontend/eFormAPI/eFormAPI.Web/Plugins
109100
cd eform-angular-frontend/eform-client && ../../eform-angular-workflow-plugin/testinginstallpn.sh
110101
- name: Start the newly build Docker container
@@ -116,11 +107,19 @@ jobs:
116107
run: cat docker_run_log
117108
- name: Pretest changes to work with Docker container
118109
run: sed -i 's/localhost/mariadbtest/g' eform-angular-frontend/eform-client/e2e/Constants/DatabaseConfigurationConstants.ts
119-
- name: NPM install
120-
run: cd eform-angular-frontend/eform-client && npm install
121-
if: steps.cache.outputs.cache-hit != 'true'
122-
- name: Configuration testing
123-
run: cd eform-angular-frontend/eform-client && npm run testheadless
110+
- name: yarn install
111+
run: cd eform-angular-frontend/eform-client && yarn install
112+
- name: DB Configuration
113+
uses: cypress-io/github-action@v4
114+
with:
115+
start: echo 'hi'
116+
wait-on: "http://localhost:4200"
117+
wait-on-timeout: 120
118+
browser: chrome
119+
record: false
120+
spec: cypress/e2e/db/*
121+
config-file: cypress.config.ts
122+
working-directory: eform-angular-frontend/eform-client
124123
- name: Change rabbitmq hostname
125124
run: docker exec -i mariadbtest mysql -u root --password=secretpassword -e 'update 420_SDK.Settings set Value = "my-rabbit" where Name = "rabbitMqHost"'
126125
- name: Plugin testing

‎Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ FROM node:18.12.1 as node-env
22
WORKDIR /app
33
ENV PATH /app/node_modules/.bin:$PATH
44
COPY eform-angular-frontend/eform-client ./
5-
RUN npm install
5+
RUN yarn install
66
RUN npm run build
77

88
FROM mcr.microsoft.com/dotnet/sdk:7.0 AS build-env

‎devgetchanges.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ cp -a Documents/workspace/microting/eform-angular-frontend/eFormAPI/Plugins/Work
1313
# Test files rm
1414
rm -fR Documents/workspace/microting/eform-angular-workflow-plugin/eform-client/e2e/Tests/workflow-settings/
1515
rm -fR Documents/workspace/microting/eform-angular-workflow-plugin/eform-client/e2e/Tests/workflow-general/
16-
rm -fR Documents/workspace/microting/eform-angular-workflow-plugin/eform-client/wdio-headless-plugin-step2.conf.js
16+
rm -fR Documents/workspace/microting/eform-angular-workflow-plugin/eform-client/wdio-headless-plugin-step2.conf.ts
1717
rm -fR Documents/workspace/microting/eform-angular-workflow-plugin/eform-client/e2e/Page\ objects/Workflow
1818

1919
# Test files cp
2020
cp -a Documents/workspace/microting/eform-angular-frontend/eform-client/e2e/Tests/workflow-settings Documents/workspace/microting/eform-angular-workflow-plugin/eform-client/e2e/Tests/workflow-settings
2121
cp -a Documents/workspace/microting/eform-angular-frontend/eform-client/e2e/Tests/workflow-general Documents/workspace/microting/eform-angular-workflow-plugin/eform-client/e2e/Tests/workflow-general
22-
cp -a Documents/workspace/microting/eform-angular-frontend/eform-client/wdio-plugin-step2.conf.js Documents/workspace/microting/eform-angular-workflow-plugin/eform-client/wdio-headless-plugin-step2.conf.js
22+
cp -a Documents/workspace/microting/eform-angular-frontend/eform-client/wdio-plugin-step2.conf.ts Documents/workspace/microting/eform-angular-workflow-plugin/eform-client/wdio-headless-plugin-step2.conf.ts
2323
cp -a Documents/workspace/microting/eform-angular-frontend/eform-client/e2e/Page\ objects/Workflow Documents/workspace/microting/eform-angular-workflow-plugin/eform-client/e2e/Page\ objects/Workflow

‎devinstall.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ cp -a Documents/workspace/microting/eform-angular-workflow-plugin/eFormAPI/Plugi
1616
rm -fR Documents/workspace/microting/eform-angular-frontend/eform-client/e2e/Tests/workflow-settings
1717
rm -fR Documents/workspace/microting/eform-angular-frontend/eform-client/e2e/Tests/workflow-general
1818
rm -fR Documents/workspace/microting/eform-angular-frontend/eform-client/e2e/Page\ objects/Workflow
19-
rm -fR Documents/workspace/microting/eform-angular-frontend/eform-client/wdio-plugin-step2.conf.js
19+
rm -fR Documents/workspace/microting/eform-angular-frontend/eform-client/wdio-plugin-step2.conf.ts
2020

2121
# Test files cp
2222
cp -a Documents/workspace/microting/eform-angular-workflow-plugin/eform-client/e2e/Tests/workflow-settings Documents/workspace/microting/eform-angular-frontend/eform-client/e2e/Tests/workflow-settings
2323
cp -a Documents/workspace/microting/eform-angular-workflow-plugin/eform-client/e2e/Tests/workflow-general Documents/workspace/microting/eform-angular-frontend/eform-client/e2e/Tests/workflow-general
2424
cp -a Documents/workspace/microting/eform-angular-workflow-plugin/eform-client/e2e/Page\ objects/Workflow Documents/workspace/microting/eform-angular-frontend/eform-client/e2e/Page\ objects/Workflow
25-
cp -a Documents/workspace/microting/eform-angular-workflow-plugin/eform-client/wdio-headless-plugin-step2.conf.js Documents/workspace/microting/eform-angular-frontend/eform-client/wdio-plugin-step2.conf.js
25+
cp -a Documents/workspace/microting/eform-angular-workflow-plugin/eform-client/wdio-headless-plugin-step2.conf.ts Documents/workspace/microting/eform-angular-frontend/eform-client/wdio-plugin-step2.conf.ts

‎eform-client/wdio-headless-plugin-step2.conf.js renamed to ‎eform-client/wdio-headless-plugin-step2.conf.ts

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1-
exports.config = {
1+
//const path = require("path");
2+
import type { Options } from '@wdio/types'
3+
4+
export const config: Options.Testrunner = {
25
runner: 'local',
36
path: '/',
47
//
@@ -153,7 +156,7 @@ exports.config = {
153156
// See the full list at http://mochajs.org/
154157
mochaOpts: {
155158
ui: 'bdd',
156-
compilers: ['tsconfig-paths/register'],
159+
//compilers: ['tsconfig-paths/register'],
157160
timeout: 120000
158161
},
159162
//

‎eform-client/wdio-plugin-step2.conf.js renamed to ‎eform-client/wdio-plugin-step2.conf.ts

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1-
exports.config = {
1+
//const path = require("path");
2+
import type { Options } from '@wdio/types'
3+
4+
export const config: Options.Testrunner = {
25

36
//
47
// ==================
@@ -142,7 +145,7 @@ exports.config = {
142145
// See the full list at http://mochajs.org/
143146
mochaOpts: {
144147
ui: 'bdd',
145-
compilers: ['ts:ts-node/register'],
148+
//compilers: ['ts:ts-node/register'],
146149
timeout: 120000
147150
// requires: ['./test/helpers/common.js']
148151
},

0 commit comments

Comments
 (0)
Please sign in to comment.