From 3c2651c83f66192d0593ff117a9e557445303cf1 Mon Sep 17 00:00:00 2001 From: Reiner Schinkoethe Date: Mon, 17 Nov 2025 13:11:48 +0100 Subject: [PATCH 1/3] chore: add new sining key, use new v4 actions and update minor changes to catalog range --- .github/workflows/package-development-workflow.yml | 10 +++++----- .github/workflows/package-release-workflow.yml | 13 +++++++------ .gitignore | 1 + apax-lock.json | 14 +++++++------- apax.yml | 4 ++-- 5 files changed, 22 insertions(+), 20 deletions(-) diff --git a/.github/workflows/package-development-workflow.yml b/.github/workflows/package-development-workflow.yml index 2aae90c..cfb2174 100644 --- a/.github/workflows/package-development-workflow.yml +++ b/.github/workflows/package-development-workflow.yml @@ -27,7 +27,7 @@ jobs: name: Build and Test runs-on: ubuntu-24.04 container: - image: ghcr.io/simatic-ax/ci-images/apax-ci-image:3.5.0 + image: ghcr.io/simatic-ax/ci-images/apax-ci-image:4.2.0 credentials: username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} @@ -39,19 +39,19 @@ jobs: ref: ${{ inputs.ref != '' && inputs.ref || github.ref }} - name: Login to required registries - uses: simatic-ax/actions/apax-login@v3 + uses: simatic-ax/actions/apax-login@v4 with: apax-token: ${{ secrets.APAX_TOKEN }} registries: | https://npm.pkg.github.com/,${{ secrets.GITHUB_TOKEN }} - name: Install dependencies - uses: simatic-ax/actions/apax-install@v3 + uses: simatic-ax/actions/apax-install@v4 with: immutable: true - name: Build source code - uses: simatic-ax/actions/apax-build@v3 + uses: simatic-ax/actions/apax-build@v4 with: apax-build-targets: | llvm @@ -61,7 +61,7 @@ jobs: --log Debug - name: Test source code - uses: simatic-ax/actions/apax-test@v3 + uses: simatic-ax/actions/apax-test@v4 with: coverage: true loglevel: debug diff --git a/.github/workflows/package-release-workflow.yml b/.github/workflows/package-release-workflow.yml index 4bb3d87..6949a33 100644 --- a/.github/workflows/package-release-workflow.yml +++ b/.github/workflows/package-release-workflow.yml @@ -28,7 +28,7 @@ jobs: needs: call-development runs-on: ubuntu-24.04 container: - image: ghcr.io/simatic-ax/ci-images/apax-ci-image:3.5.0 + image: ghcr.io/simatic-ax/ci-images/apax-ci-image:4.2.0 credentials: username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} @@ -49,24 +49,25 @@ jobs: path: bin - name: Version package - uses: simatic-ax/actions/apax-version@v3 + uses: simatic-ax/actions/apax-version@v4 with: version: ${{ github.event.release.tag_name }} - name: Package source code - uses: simatic-ax/actions/apax-pack@v3 + uses: simatic-ax/actions/apax-pack@v4 with: - key: ${{ secrets.APAX_SIGNKEY }} + key: ${{ secrets.APAX_SIGNKEY_V2 }} + key-version: "v2" - name: Login to required registries - uses: simatic-ax/actions/apax-login@v3 + uses: simatic-ax/actions/apax-login@v4 with: apax-token: ${{ secrets.APAX_TOKEN }} registries: | https://npm.pkg.github.com/,${{ secrets.GITHUB_TOKEN }} - name: Publish apax package - uses: simatic-ax/actions/apax-publish@v3 + uses: simatic-ax/actions/apax-publish@v4 with: registries: | https://npm.pkg.github.com \ No newline at end of file diff --git a/.gitignore b/.gitignore index d7aee59..b8656e9 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ obj TestResult *.tgz assets +/.vs diff --git a/apax-lock.json b/apax-lock.json index 513035f..4ac318b 100644 --- a/apax-lock.json +++ b/apax-lock.json @@ -7,8 +7,8 @@ "name": "@simatic-ax/dynamics", "version": "3.0.0", "dependencies": { - "@ax/simatic-1500-clocks": "^10.0.6", - "@ax/system-math": "^10.0.24" + "@ax/simatic-clocks": "^11.0.14", + "@ax/system-math": "^10.2.7" }, "devDependencies": { "@ax/sdk": "^2510.0.0" @@ -406,11 +406,11 @@ "@ax/trace": "3.1.0" } }, - "@ax/simatic-1500-clocks": { - "name": "@ax/simatic-1500-clocks", - "version": "10.0.64", - "integrity": "sha512-LWI6z2ZP/h2UwOTgl1cAyL0R30NX8uG9OoPKUN9tPMdaHRNj3gMYFHsea11pcaPsfHFT2l3e6BEQKz43JThGjA==", - "resolved": "https://registry.simatic-ax.siemens.io/@ax/simatic-1500-clocks/-/simatic-1500-clocks-10.0.64.tgz", + "@ax/simatic-clocks": { + "name": "@ax/simatic-clocks", + "version": "11.0.14", + "integrity": "sha512-TLlV+2uV9vjhxh7c0newDhj2pIiR2blN36Ztf7hPQxG6DloDLKAbYkZpHEUMi/lhC5gIiSAUnBPbDKOnXoA2AQ==", + "resolved": "https://registry.simatic-ax.siemens.io/@ax/simatic-clocks/-/simatic-clocks-11.0.14.tgz", "dependencies": {} }, "@ax/simatic-package-tool": { diff --git a/apax.yml b/apax.yml index a086489..9ebdd9a 100644 --- a/apax.yml +++ b/apax.yml @@ -36,8 +36,8 @@ catalogs: devDependencies: "@ax/sdk": ^2510.0.0 dependencies: - "@ax/simatic-1500-clocks": ^10.0.6 - "@ax/system-math": ^10.0.24 + "@ax/simatic-clocks": ^11.0.14 + "@ax/system-math": ^10.2.7 # Files, which will be shipped with the library files: From ce7beb56e216fbd99d60fefbad01ddc77636def1 Mon Sep 17 00:00:00 2001 From: Reiner Schinkoethe Date: Mon, 17 Nov 2025 13:13:55 +0100 Subject: [PATCH 2/3] feat: use publicKeys in apax.yml --- apax.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/apax.yml b/apax.yml index 9ebdd9a..fd3618c 100644 --- a/apax.yml +++ b/apax.yml @@ -32,6 +32,11 @@ apaxVersion: 3.5.0 catalogs: "@ax/simatic-ax": ^2510.0.0 +publicKeys: + "@simatic-ax": + "v1": "3792a7e926775425ccdd29ceed8c368c3008b5b33d7d5550b3cb1f58093e1dff" + "v2": "7af3e394eb2b285a3d99ab8e1f745cc6db75704b30a80393339c721a92ffffd9" + # Dependencies devDependencies: "@ax/sdk": ^2510.0.0 From 3d222eb174e510d301dbf6e7ff8a639fac52ce8d Mon Sep 17 00:00:00 2001 From: Reiner Schinkoethe Date: Mon, 17 Nov 2025 13:19:28 +0100 Subject: [PATCH 3/3] fix breaking changes --- src/TimeProviders/MeasuredTimeProvider.st | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/TimeProviders/MeasuredTimeProvider.st b/src/TimeProviders/MeasuredTimeProvider.st index 1cbd7fb..0b32488 100644 --- a/src/TimeProviders/MeasuredTimeProvider.st +++ b/src/TimeProviders/MeasuredTimeProvider.st @@ -1,4 +1,4 @@ -USING Siemens.Simatic.S71500.Clocks; +USING Siemens.Simatic.Clocks; NAMESPACE Simatic.Ax.Dynamics /// Uses a `Siemens.Simatic.S71500.Clocks.RuntimeMeasurement` CLASS MeasuredTimeProvider IMPLEMENTS IElapsedSecondsProvider