Skip to content
Merged
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
13 changes: 11 additions & 2 deletions .github/workflows/nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,20 @@ jobs:
env:
GH_TOKEN : ${{ secrets.GH_TOKEN }}

- name: Compare Commit SHAs
- name: Fetch Stored APP_RUN_RESULT from Repository Variable
if: github.ref == 'refs/heads/dev' && github.event_name != 'workflow_dispatch'
shell: pwsh
run: |
if ($env:CURRENT_SHA -eq $env:STORED_SHA) {
$appRunResult = gh variable get APP_RUN_RESULT --json value | ConvertFrom-Json | Select-Object -ExpandProperty value
"APP_RUN_RESULT=$appRunResult" | Out-File -FilePath $env:GITHUB_ENV -Append -Encoding utf8
env:
GH_TOKEN : ${{ secrets.GH_TOKEN }}

- name: Compare Commit SHAs and previous result
if: github.ref == 'refs/heads/dev' && github.event_name != 'workflow_dispatch'
shell: pwsh
run: |
if ($env:CURRENT_SHA -eq $env:STORED_SHA && $env:APP_RUN_RESULT -eq "0") {
echo "SHA Match: Skipping Steps"
"SKIP_STEPS=true" | Out-File -FilePath $env:GITHUB_ENV -Append -Encoding utf8
}
Expand Down
2 changes: 1 addition & 1 deletion src/abstractions/app/apax.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ variables:
# Do not commit any changes to the following variables. You may modify them locally, but committing the changes will mess up the nightly build. =>
PLC_NAME: "plc_line"
DEFAULT_NAMESPACE: "AXOpen.Abstractions"
AXTARGET: 10.10.10.120
AXTARGET: 192.168.100.120
AXTARGETPLATFORMINPUT: .\bin\1500\
AX_USERNAME: "adm"
AX_TARGET_PWD: "123ABCDabcd$#!"
Expand Down
2 changes: 1 addition & 1 deletion src/abstractions/app/hwc/plc_line.hwl.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Devices:
TemplateName: 6ES7516-3AP03-0AB0_v3_1
Arguments:
PLCName: plc_line
IpAddress_X1: 10.10.10.120/24
IpAddress_X1: 192.168.100.120/24
ProfinetDeviceName_X1: plc_line_x1
IoSystems:
- Name: profinet_plc_line
Expand Down
2 changes: 1 addition & 1 deletion src/abstractions/app/ix/Entry.cs
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ public class ConnectionConfig
public class TwinConnectorSelector
{
// Do not commit any changes to the following variables. You may modify them locally, but committing the changes will mess up the nightly build. =>
public static string TargetIp { get; } = "10.10.10.120";//Environment.GetEnvironmentVariable("AXTARGET"); // <- replace by your IP
public static string TargetIp { get; } = "192.168.100.120";//Environment.GetEnvironmentVariable("AXTARGET"); // <- replace by your IP
private static string Pass => @"123ABCDabcd$#!"; //Environment.GetEnvironmentVariable("AX_TARGET_PWD"); //Environment.GetEnvironmentVariable("AX_TARGET_PWD"); // <- Pass in the password that you have set up for the user. NOT AS PLAIN TEXT! Use user secrets instead.
private static string UserName = "adm"; //Environment.GetEnvironmentVariable("AX_USERNAME"); //<- replace by user name you have set up in your WebAPI settings
private const bool IgnoreSslErrors = true; // <- When you have your certificates in order set this to false.
Expand Down
2 changes: 1 addition & 1 deletion src/components.abb.robotics/app/apax.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ variables:
# Do not commit any changes to the following variables. You may modify them locally, but committing the changes will mess up the nightly build. =>
PLC_NAME: "plc_line"
DEFAULT_NAMESPACE: "AXOpen.Components.Abb.Robotics"
AXTARGET: 10.10.10.120
AXTARGET: 192.168.100.120
AXTARGETPLATFORMINPUT: .\bin\1500\
AX_USERNAME: "adm"
AX_TARGET_PWD: "123ABCDabcd$#!"
Expand Down
2 changes: 1 addition & 1 deletion src/components.abb.robotics/app/hwc/plc_line.hwl.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Devices:
TemplateName: 6ES7516-3AP03-0AB0_v3_1
Arguments:
PLCName: plc_line
IpAddress_X1: 10.10.10.120/24
IpAddress_X1: 192.168.100.120/24
ProfinetDeviceName_X1: plc_line_x1
IoSystems:
- Name: profinet_plc_line
Expand Down
2 changes: 1 addition & 1 deletion src/components.abb.robotics/app/ix/Entry.cs
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ public class ConnectionConfig
public class TwinConnectorSelector
{
// Do not commit any changes to the following variables. You may modify them locally, but committing the changes will mess up the nightly build. =>
public static string TargetIp { get; } = "10.10.10.120";//Environment.GetEnvironmentVariable("AXTARGET"); // <- replace by your IP
public static string TargetIp { get; } = "192.168.100.120";//Environment.GetEnvironmentVariable("AXTARGET"); // <- replace by your IP
private static string Pass => @"123ABCDabcd$#!"; //Environment.GetEnvironmentVariable("AX_TARGET_PWD"); //Environment.GetEnvironmentVariable("AX_TARGET_PWD"); // <- Pass in the password that you have set up for the user. NOT AS PLAIN TEXT! Use user secrets instead.
private static string UserName = "adm"; //Environment.GetEnvironmentVariable("AX_USERNAME"); //<- replace by user name you have set up in your WebAPI settings
private const bool IgnoreSslErrors = true; // <- When you have your certificates in order set this to false.
Expand Down
2 changes: 1 addition & 1 deletion src/components.abb.robotics/ctrl/assets/OmniCore.hwl.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Devices:
Label: X1
Addresses:
Configured:
- IPv4: 10.10.10.2/24
- IPv4: 192.168.100.2/24
- ProfinetDeviceName: OmniCore
- Name: DI_64_bytes
TypeIdentifier:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Devices:
Label: X1
Addresses:
Configured:
- IPv4: 10.10.10.1/24
- IPv4: 192.168.100.1/24
- ProfinetDeviceName: RobotBasicIO
- Name: DI_64_bytes
TypeIdentifier:
Expand Down
Loading
Loading