Skip to content

Commit

Permalink
Revert "556 investigate nightly build issues (#562)"
Browse files Browse the repository at this point in the history
This reverts commit ebc067e.
  • Loading branch information
PTKu authored Jan 30, 2025
1 parent afd9889 commit 990f4ad
Show file tree
Hide file tree
Showing 67 changed files with 194 additions and 1,051 deletions.
90 changes: 0 additions & 90 deletions scripts/_pack_and_publish_catalog.ps1

This file was deleted.

58 changes: 33 additions & 25 deletions scripts/app-test.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -410,19 +410,20 @@ function Start-DotNetTool {
Write-Output "Command completed successfully."
Write-Output $output

# Check the exit code
if ($process.ExitCode -eq 0)
{
Write-Output "Command completed successfully."
Write-Output $output
return $true
}
else
{
Write-Error "Command failed with exit code: $($process.ExitCode)"
Write-Error $errorOutput
return $false
}
###### TODO ##### When running with github action runner, each error cause stop of the action so the error output needs to be forwarded to some logfile in the future
## Check the exit code
#if ($process.ExitCode -eq 0)
#{
# Write-Output "Command completed successfully."
# Write-Output $output
# return $true
#}
#else
#{
# Write-Error "Command failed with exit code: $($process.ExitCode)"
# Write-Error $errorOutput
# return $false
#}
}
catch
{
Expand Down Expand Up @@ -482,10 +483,11 @@ function Start-DotNetProject {
}
else
{
Write-Error "Project failed to start. Check for errors."
###### TODO ##### When running with github action runner, each error cause stop of the action so the error output needs to be forwarded to some logfile in the
#Write-Error "Project failed to start. Check for errors."
# Read output and error streams
$errorOutput = Get-Content $stdErrFile
Write-Output $errorOutput
#$errorOutput = Get-Content $stdErrFile
#Write-Output $errorOutput
Stop-Process -Id $process.Id -Force #???
return $false
}
Expand Down Expand Up @@ -539,22 +541,27 @@ function BuildAndLoadPlc {
}
cd $appFolder
# apax install
$result = run-command -command "apax install"
#$result = run-command -command "apax install"
apax install > $null 2>&1
return
if ($($result.Success) -match "True")
{
Write-Output "Command 'apax install' finished succesfully in $appFolder"
}
else
{
$result.error| foreach-object { write-output $_ }
}
###### TODO ##### When running with github action runner, each error cause stop of the action so the error output needs to be forwarded to some logfile in the future
#else
#{
# $result.error| foreach-object { write-output $_ }
#}
# apax plcsim
$plcSimProjPath = [System.IO.Path]::GetFullPath((Join-Path -Path $appFolder -ChildPath "..\..\tools\src\PlcSimAdvancedStarter\PlcSimAdvancedStarterTool\PlcSimAdvancedStarterTool.csproj"))
$result = Start-DotNetTool -ProjectName $plcSimProjPath -Arguments "-- startplcsim -x $appName -n $plcName -t $plcIpAddress"
$result.output | foreach-object { write-output $_ }
###### TODO ##### When running with github action runner, each error cause stop of the action so the error output needs to be forwarded to some logfile in the future
#$result.output | foreach-object { write-output $_ }
# apax hwu
$result = Run-Command -Command "apax hwu"
$result.Output | ForEach-Object { Write-Output $_ }
###### TODO ##### When running with github action runner, each error cause stop of the action so the error output needs to be forwarded to some logfile in the future
#$result.Output | ForEach-Object { Write-Output $_ }
if ($($result.Success) -match "True")
{
$textToWrite = ",OK"
Expand All @@ -567,7 +574,8 @@ function BuildAndLoadPlc {
Write-Result -TextToWrite $textToWrite -LogFilePath $logFilePath -AppendToSameLine
# apax swfd
$result = Run-Command -Command "apax swfd"
$result.Output | ForEach-Object { Write-Output $_ }
###### TODO ##### When running with github action runner, each error cause stop of the action so the error output needs to be forwarded to some logfile in the future
#$result.Output | ForEach-Object { Write-Output $_ }
if ($($result.Success) -match "True")
{
$textToWrite = ",OK"
Expand Down Expand Up @@ -824,7 +832,7 @@ if ($appYamls)
###### Build and load PLC
BuildAndLoadPlc -appYamlFile $($appYaml.FilePath) -appName $($appYaml.AppName) -logFilePath $logFilePath -summaryResult ([ref]$SumaryResult)
###### Build and start HMI
BuildAndStartHmi -appYamlFile $($appYaml.FilePath) -appName $($appYaml.AppName) -logFilePath $logFilePath -summaryResult ([ref]$SumaryResult)
#BuildAndStartHmi -appYamlFile $($appYaml.FilePath) -appName $($appYaml.AppName) -logFilePath $logFilePath -summaryResult ([ref]$SumaryResult)
}
}

Expand Down
18 changes: 5 additions & 13 deletions src/abstractions/app/apax.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,11 @@ dependencies:
"@inxton/axopen.core": '0.0.0-dev.0'
"@inxton/ax.axopen.app": '0.0.0-dev.0'
"@inxton/axopen.simatic1500": '0.0.0-dev.0'
installStrategy: strict
# this is just temporary to be able create hardware configuration using latest hwc version
# upto the moment of releasing new catalog
# installStrategy: strict
"@inxton/ax.latest.packages": '0.0.0-dev.0'
installStrategy: overridable
apaxVersion: 3.4.2
scripts:
# For proper execution of these scripts, the following variables need to be defined as environment variables or local variables.
Expand Down Expand Up @@ -104,15 +108,3 @@ scripts:
START=$(date +%s)
..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED
echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - Finished in :" $(expr $(date +%s) - $START) "s"
ib: |
apax install
apax build
icb: |
apax install --catalog
apax ib
cib: |
apax clean
apax ib
cicb: |
apax clean
apax icb
13 changes: 0 additions & 13 deletions src/abstractions/ctrl/apax.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,19 +15,6 @@ apaxVersion: 3.4.2
scripts:
postbuild:
- dotnet ixc
ib: |
apax install
apax build
icb: |
apax install --catalog
apax ib
cib: |
apax clean
apax ib
cicb: |
apax clean
apax icb
publicKeys:
"@inxton": 30c06ef7830b4dfd8f16e003508da1ac2d187714d0e1f38279a9332cbe4e4e17
...
8 changes: 0 additions & 8 deletions src/ax.axopen.app/ax.axopen.app.code-workspace

This file was deleted.

20 changes: 2 additions & 18 deletions src/ax.axopen.app/ctrl/apax.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,30 +3,14 @@ version: '0.0.0-dev.0'
type: generic
files:
- apax.yml
registries:
"@inxton": "https://npm.pkg.github.com/"
catalogs:
# "@ax/simatic-ax": 2411.0.0
"@inxton/ax.catalog": 0.0.3
devDependencies:
"@inxton/ax-sdk": '0.0.0-dev.0'
catalogs:
"@ax/simatic-ax": 2411.0.0
dependencies:
"@ax/simatic-1500-clocks": 8.0.8
"@ax/system-bitaccess": 8.0.7
"@ax/system-math": 8.0.7
"@ax/system-serde": 8.0.7
installStrategy: strict
apaxVersion: 3.4.2
scripts:
ib: |
apax install
apax build
icb: |
apax install --catalog
apax ib
cib: |
apax clean
apax ib
cicb: |
apax clean
apax icb
8 changes: 0 additions & 8 deletions src/ax.axopen.hwlibrary/ax.axopen.hwlibrary.code-workspace

This file was deleted.

20 changes: 2 additions & 18 deletions src/ax.axopen.hwlibrary/ctrl/apax.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,10 @@ version: '0.0.0-dev.0'
type: generic
files:
- apax.yml
registries:
"@inxton": "https://npm.pkg.github.com/"
catalogs:
# "@ax/simatic-ax": 2411.0.0
"@inxton/ax.catalog": 0.0.3
devDependencies:
"@inxton/ax-sdk": '0.0.0-dev.0'
catalogs:
"@ax/simatic-ax": 2411.0.0
dependencies:
"@inxton/ax.axopen.min": '0.0.0-dev.0'
"@ax/simatic-1500-distributedio": 8.0.6
Expand All @@ -20,16 +17,3 @@ dependencies:
"@ax/system-bitaccess": 8.0.7
installStrategy: strict
apaxVersion: 3.4.2
scripts:
ib: |
apax install
apax build
icb: |
apax install --catalog
apax ib
cib: |
apax clean
apax ib
cicb: |
apax clean
apax icb
8 changes: 0 additions & 8 deletions src/ax.axopen.min/ax.axopen.min.code-workspace

This file was deleted.

20 changes: 2 additions & 18 deletions src/ax.axopen.min/ctrl/apax.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,27 +3,11 @@ version: '0.0.0-dev.0'
type: generic
files:
- apax.yml
registries:
"@inxton": "https://npm.pkg.github.com/"
catalogs:
# "@ax/simatic-ax": 2411.0.0
"@inxton/ax.catalog": 0.0.3
devDependencies:
"@inxton/ax-sdk": '0.0.0-dev.0'
catalogs:
"@ax/simatic-ax": 2411.0.0
dependencies:
"@ax/system-strings": 8.0.7
installStrategy: strict
apaxVersion: 3.4.2
scripts:
ib: |
apax install
apax build
icb: |
apax install --catalog
apax ib
cib: |
apax clean
apax ib
cicb: |
apax clean
apax icb
Loading

0 comments on commit 990f4ad

Please sign in to comment.