Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 32 additions & 25 deletions .github/workflows/build-and-test.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# Copyright (c) 2025, Phoenix Contact GmbH & Co. KG
# Licensed under the Apache License, Version 2.0

name: CI

# Controls when the action will run. Triggers the workflow on push or pull request
Expand All @@ -6,6 +9,7 @@ on:
branches:
- dev
- future
- feature/shared-node-modules
tags:
- v[0-9]+.[0-9]+.[0-9]+ # Matches all semantic versioning tags with major, minor, patch
pull_request:
Expand Down Expand Up @@ -37,37 +41,40 @@ jobs:
MORYX_PACKAGE_TARGET_V3_FUTURE: ${{ env.MORYX_PACKAGE_TARGET_V3_FUTURE }}
MORYX_PACKAGE_TARGET_RELEASE: ${{ env.MORYX_PACKAGE_TARGET_RELEASE }}
MORYX_PACKAGE_TARGET_V3_RELEASE: ${{ env.MORYX_PACKAGE_TARGET_V3_RELEASE }}

Build:
BuildYarn:
needs: [EnvVar]
uses: phoenixcontact/tools/.github/workflows/build-tool.yml@main
uses: phoenixcontact/tools/.github/workflows/build-yarn-tool.yml@yarn-build

BuildDotNet:
needs: [BuildYarn]
uses: phoenixcontact/tools/.github/workflows/build-tool.yml@yarn-build
with:
dotnet_sdk_version: ${{ needs.EnvVar.outputs.dotnet_sdk_version }}
REPOSITORY_NAME: ${{ needs.EnvVar.outputs.REPOSITORY_NAME }}

# UnitTests:
# needs: [EnvVar, Build]
# uses: phoenixcontact/tools/.github/workflows/unittest-tool.yml@main
# needs: [EnvVar, BuildDotNet]
# uses: phoenixcontact/tools/.github/workflows/unittest-tool.yml@yarn-build
# with:
# dotnet_sdk_version: ${{ needs.EnvVar.outputs.dotnet_sdk_version }}
# REPOSITORY_NAME: ${{ needs.EnvVar.outputs.REPOSITORY_NAME }}
#
# IntegrationTests:
# needs: [EnvVar, Build]
# uses: phoenixcontact/tools/.github/workflows/integrationtest-tool.yml@main
# needs: [EnvVar, BuildDotNet]
# uses: phoenixcontact/tools/.github/workflows/integrationtest-tool.yml@yarn-build
# with:
# dotnet_sdk_version: ${{ needs.EnvVar.outputs.dotnet_sdk_version }}
# REPOSITORY_NAME: ${{ needs.EnvVar.outputs.REPOSITORY_NAME }}
#
# ReportGenerator:
# needs: [EnvVar, UnitTests, IntegrationTests]
# uses: phoenixcontact/tools/.github/workflows/reportgenerator-tool.yml@main
# uses: phoenixcontact/tools/.github/workflows/reportgenerator-tool.yml@yarn-build
# with:
# REPOSITORY_NAME: ${{ needs.EnvVar.outputs.REPOSITORY_NAME }}
#
# Publish-Test-Coverage:
# needs: [EnvVar, ReportGenerator]
# uses: phoenixcontact/tools/.github/workflows/publish-test-coverage-tool.yml@main
# uses: phoenixcontact/tools/.github/workflows/publish-test-coverage-tool.yml@yarn-build
# with:
# REPOSITORY_NAME: ${{ needs.EnvVar.outputs.REPOSITORY_NAME }}
# secrets:
Expand All @@ -77,22 +84,22 @@ jobs:
# currently not working
# Documentation:
# needs: [EnvVar, UnitTests]
# uses: phoenixcontact/tools/.github/workflows/documentation-tool.yml@main
# uses: phoenixcontact/tools/.github/workflows/documentation-tool.yml@yarn-build
# with:
# REPOSITORY_NAME: ${{ needs.EnvVar.outputs.REPOSITORY_NAME }}

Publish:
needs: [EnvVar, Build] #, UnitTests]
uses: phoenixcontact/tools/.github/workflows/publish-tool.yml@main
with:
dotnet_sdk_version: ${{ needs.EnvVar.outputs.dotnet_sdk_version }}
REPOSITORY_NAME: ${{ needs.EnvVar.outputs.REPOSITORY_NAME }}
MORYX_PACKAGE_TARGET_DEV: ${{ needs.EnvVar.outputs.MORYX_PACKAGE_TARGET_DEV }}
MORYX_PACKAGE_TARGET_V3_DEV: ${{ needs.EnvVar.outputs.MORYX_PACKAGE_TARGET_V3_DEV }}
MORYX_PACKAGE_TARGET_FUTURE: ${{ needs.EnvVar.outputs.MORYX_PACKAGE_TARGET_FUTURE }}
MORYX_PACKAGE_TARGET_V3_FUTURE: ${{ needs.EnvVar.outputs.MORYX_PACKAGE_TARGET_V3_FUTURE }}
MORYX_PACKAGE_TARGET_RELEASE: ${{ needs.EnvVar.outputs.MORYX_PACKAGE_TARGET_RELEASE }}
MORYX_PACKAGE_TARGET_V3_RELEASE: ${{ needs.EnvVar.outputs.MORYX_PACKAGE_TARGET_V3_RELEASE }}
secrets:
MYGET_TOKEN: ${{secrets.MYGET_TOKEN}}
NUGET_TOKEN: ${{secrets.NUGET_TOKEN}}
# Publish:
# needs: [EnvVar, BuildDotNet] #, UnitTests]
# uses: phoenixcontact/tools/.github/workflows/publish-tool.yml@yarn-build
# with:
# dotnet_sdk_version: ${{ needs.EnvVar.outputs.dotnet_sdk_version }}
# REPOSITORY_NAME: ${{ needs.EnvVar.outputs.REPOSITORY_NAME }}
# MORYX_PACKAGE_TARGET_DEV: ${{ needs.EnvVar.outputs.MORYX_PACKAGE_TARGET_DEV }}
# MORYX_PACKAGE_TARGET_V3_DEV: ${{ needs.EnvVar.outputs.MORYX_PACKAGE_TARGET_V3_DEV }}
# MORYX_PACKAGE_TARGET_FUTURE: ${{ needs.EnvVar.outputs.MORYX_PACKAGE_TARGET_FUTURE }}
# MORYX_PACKAGE_TARGET_V3_FUTURE: ${{ needs.EnvVar.outputs.MORYX_PACKAGE_TARGET_V3_FUTURE }}
# MORYX_PACKAGE_TARGET_RELEASE: ${{ needs.EnvVar.outputs.MORYX_PACKAGE_TARGET_RELEASE }}
# MORYX_PACKAGE_TARGET_V3_RELEASE: ${{ needs.EnvVar.outputs.MORYX_PACKAGE_TARGET_V3_RELEASE }}
# secrets:
# MYGET_TOKEN: ${{secrets.MYGET_TOKEN}}
# NUGET_TOKEN: ${{secrets.NUGET_TOKEN}}
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,7 @@ orleans.codegen.cs
**/node_modules
*npm-debug.log
*yarn-error.log
yarn.lock

# IDEs and editors
**/.idea/
Expand Down
5 changes: 5 additions & 0 deletions .yarnrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
# yarn lockfile v1


"@moryx:registry" "https://www.myget.org/F/moryx/npm"
18 changes: 18 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"private": true,
"workspaces": [
"src/Moryx.Analytics.Web",
"src/Moryx.CommandCenter.Web",
"src/Moryx.ControlSystem.ProcessEngine.Web",
"src/Moryx.ControlSystem.WorkerSupport.Web",
"src/Moryx.FactoryMonitor.Web",
"src/Moryx.Media.Web",
"src/Moryx.Notifications.Web",
"src/Moryx.Operators.Web",
"src/Moryx.Orders.Web",
"src/Moryx.Products.Web",
"src/Moryx.Resources.Web",
"src/Moryx.Shifts.Web",
"src/Moryx.Workplans.Web"
]
}
8 changes: 4 additions & 4 deletions src/Moryx.Analytics.Web/Moryx.Analytics.Web.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,9 @@
</EmbeddedResource>
</ItemGroup>
<Target Name="BuildUI" Condition="('$(Configuration)'!='Debug' Or !Exists('wwwroot\main.js')) And ('$(NoBuild)' != 'true') ">
<Exec WorkingDirectory=".\" Command="npm config set strict-ssl false" />
<Exec WorkingDirectory=".\" Command="npm install" />
<Exec WorkingDirectory=".\" Command="npm run build:prod" />
<Exec WorkingDirectory=".\" Command="npm config set strict-ssl true" />
<!-- Run yarn install in the parent directory -->
<Exec WorkingDirectory="..\.." Command="yarn install" />
<!-- Build the Angular project using yarn in the current directory -->
<Exec WorkingDirectory=".\\" Command="yarn run build:prod" />
</Target>
</Project>
2 changes: 1 addition & 1 deletion src/Moryx.Analytics.Web/angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"inlineStyleLanguage": "scss",
"assets": ["src/favicon.ico", "src/assets"],
"styles": [
"node_modules/@moryx/ngx-web-framework/styles/theme.scss",
"../../node_modules/@moryx/ngx-web-framework/styles/theme.scss",
"src/styles.scss"
],
"scripts": [],
Expand Down
Loading
Loading