Skip to content

Commit

Permalink
Add apax package signing (#254)
Browse files Browse the repository at this point in the history
* wip

* Create draft PR for #225

* wip

* Template simple improvement

* keys added

* version bump to 0.4.1

* mend

---------

Co-authored-by: PTKu <[email protected]>
Co-authored-by: Branko Zachemsky <[email protected]>
  • Loading branch information
3 people authored Oct 7, 2023
1 parent 33baaf8 commit ae81c21
Show file tree
Hide file tree
Showing 17 changed files with 34 additions and 6 deletions.
2 changes: 1 addition & 1 deletion GitVersion.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
mode: ContinuousDeployment
next-version: 0.4.0
next-version: 0.4.1
branches:
main:
regex: ^master$|^main$
Expand Down
2 changes: 1 addition & 1 deletion build.ps1
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
./scripts/check_requisites.ps1

$args = $args + '-x -n'
dotnet run --project cake/Build.csproj -- $args
exit $LASTEXITCODE;
4 changes: 3 additions & 1 deletion cake/ApaxCmd.cs
Original file line number Diff line number Diff line change
Expand Up @@ -115,11 +115,13 @@ public static void ApaxUpdate(this BuildContext context, (string folder, string

public static void ApaxPack(this BuildContext context, (string folder, string name, bool pack) lib)
{

System.Console.WriteLine(context.ApaxSignKey);
if (lib.pack)
{
context.ProcessRunner.Start(Helpers.GetApaxCommand(), new ProcessSettings()
{
Arguments = "pack",
Arguments = $"pack --key={context.ApaxSignKey}",
WorkingDirectory = context.GetLibFolder(lib),
RedirectStandardOutput = false,
RedirectStandardError = false,
Expand Down
2 changes: 2 additions & 0 deletions cake/BuildContext.cs
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,8 @@ public BuildContext(ICakeContext context, BuildParameters buildParameters)

public string GitHubToken { get; } = System.Environment.GetEnvironmentVariable("GH_TOKEN");

public string ApaxSignKey { get; } = System.Environment.GetEnvironmentVariable("APAX_KEY");

public IEnumerable<string> GetAxFolders((string folder, string name, bool pack) library)
{
var paths = new string[]
Expand Down
2 changes: 1 addition & 1 deletion scripts/publish.ps1
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# run build

dotnet run --project cake/Build.csproj --do-test --do-pack --do-publish --test-level 100
dotnet run --project cake/Build.csproj --do-test --do-pack --do-publish --test-level 1 -n -x
exit $LASTEXITCODE;
2 changes: 2 additions & 0 deletions src/abstractions/ctrl/apax.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,5 @@ dependencies:
scripts:
postbuild:
- dotnet ixc
publicKeys:
"@ix-ax" : 30c06ef7830b4dfd8f16e003508da1ac2d187714d0e1f38279a9332cbe4e4e17
2 changes: 2 additions & 0 deletions src/components.abstractions/ctrl/apax.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,5 @@ scripts:
- dotnet ixc
dependencies:
"@ix-ax/axopen.core": '0.0.0-dev.0'
publicKeys:
"@ix-ax" : 30c06ef7830b4dfd8f16e003508da1ac2d187714d0e1f38279a9332cbe4e4e17
2 changes: 2 additions & 0 deletions src/components.cognex.vision/ctrl/apax.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,5 @@ dependencies:
"@ix-ax/axopen.components.abstractions": '0.0.0-dev.0'
"@ix-ax/axopen.core": '0.0.0-dev.0'
"@ix-ax/axopen.utils": '0.0.0-dev.0'
publicKeys:
"@ix-ax" : 30c06ef7830b4dfd8f16e003508da1ac2d187714d0e1f38279a9332cbe4e4e17
4 changes: 3 additions & 1 deletion src/components.elements/ctrl/apax.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,7 @@ scripts:
- dotnet ixc
dependencies:
"@ix-ax/axopen.components.abstractions": '0.0.0-dev.0'
"@ix-ax/axopen.core" : '0.0.0-dev.0'
"@ix-ax/axopen.core" : '0.0.0-dev.0'
publicKeys:
"@ix-ax" : 30c06ef7830b4dfd8f16e003508da1ac2d187714d0e1f38279a9332cbe4e4e17

4 changes: 3 additions & 1 deletion src/components.pneumatics/ctrl/apax.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,6 @@ scripts:
download:
- START=$(date +%s)
- apax sld --accept-security-disclaimer -t $AXTARGET -i $AXTARGETPLATFORMINPUT -r --default-server-interface
- echo "Downloaded in :" $(expr $(date +%s) - $START) "s"
- echo "Downloaded in :" $(expr $(date +%s) - $START) "s"
publicKeys:
"@ix-ax" : 30c06ef7830b4dfd8f16e003508da1ac2d187714d0e1f38279a9332cbe4e4e17
2 changes: 2 additions & 0 deletions src/core/ctrl/apax.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,5 @@ scripts:
dependencies:
"@ix-ax/axopen.timers": '0.0.0-dev.0'
"@ix-ax/axopen.abstractions": '0.0.0-dev.0'
publicKeys:
"@ix-ax" : 30c06ef7830b4dfd8f16e003508da1ac2d187714d0e1f38279a9332cbe4e4e17
2 changes: 2 additions & 0 deletions src/data/ctrl/apax.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,5 @@ devDependencies:
scripts:
postbuild:
- dotnet ixc
publicKeys:
"@ix-ax" : 30c06ef7830b4dfd8f16e003508da1ac2d187714d0e1f38279a9332cbe4e4e17
2 changes: 2 additions & 0 deletions src/inspectors/ctrl/apax.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,5 @@ dependencies:
"@ix-ax/axopen.core": '0.0.0-dev.0'
"@ax/sld": ^1.0.11
#"@ix-ax/axopen.simatic1500": '0.0.0-dev.0'
publicKeys:
"@ix-ax" : 30c06ef7830b4dfd8f16e003508da1ac2d187714d0e1f38279a9332cbe4e4e17
2 changes: 2 additions & 0 deletions src/probers/ctrl/apax.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,3 +41,5 @@ scripts:
- apax download
postbuild:
- apax ixc
publicKeys:
"@ix-ax" : 30c06ef7830b4dfd8f16e003508da1ac2d187714d0e1f38279a9332cbe4e4e17
2 changes: 2 additions & 0 deletions src/template.axolibrary/ctrl/apax.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,5 @@ scripts:
dependencies:
"@ix-ax/axopen.components.abstractions": '0.0.0-dev.0'
"@ix-ax/axopen.core": '0.0.0-dev.0'
publicKeys:
"@ix-ax" : 30c06ef7830b4dfd8f16e003508da1ac2d187714d0e1f38279a9332cbe4e4e17
2 changes: 2 additions & 0 deletions src/timers/ctrl/apax.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,5 @@ devDependencies:
"@ax/stc": ^5.4.89
dependencies:
"@ix-ax/axopen.abstractions": '0.0.0-dev.0'
publicKeys:
"@ix-ax" : 30c06ef7830b4dfd8f16e003508da1ac2d187714d0e1f38279a9332cbe4e4e17
2 changes: 2 additions & 0 deletions src/utils/ctrl/apax.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,5 @@ scripts:
dependencies:
"@ax/system-serde": ^5.0.60
"@ax/system-strings": ^5.0.60
publicKeys:
"@ix-ax" : 30c06ef7830b4dfd8f16e003508da1ac2d187714d0e1f38279a9332cbe4e4e17

0 comments on commit ae81c21

Please sign in to comment.