From eb8d6c245b93d28a79cf34a59eea3b7052eeea07 Mon Sep 17 00:00:00 2001 From: Reiner Schinkoethe Date: Fri, 14 Nov 2025 11:23:27 +0100 Subject: [PATCH 1/5] fix: use actions version 4 --- .github/workflows/package-development-workflow.yml | 8 ++++---- .github/workflows/package-release-workflow.yml | 7 ++++--- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.github/workflows/package-development-workflow.yml b/.github/workflows/package-development-workflow.yml index 6e64e6b..8746d89 100644 --- a/.github/workflows/package-development-workflow.yml +++ b/.github/workflows/package-development-workflow.yml @@ -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 424f17e..38343a7 100644 --- a/.github/workflows/package-release-workflow.yml +++ b/.github/workflows/package-release-workflow.yml @@ -49,17 +49,18 @@ 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_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: | From 194d904e7f34fe21c15670bed72d5f5f1549552b Mon Sep 17 00:00:00 2001 From: Reiner Schinkoethe Date: Fri, 14 Nov 2025 11:25:10 +0100 Subject: [PATCH 2/5] add public keys for local build --- apax.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/apax.yml b/apax.yml index 18f9296..9457f04 100644 --- a/apax.yml +++ b/apax.yml @@ -22,6 +22,11 @@ targets: - 'llvm' # Dependencies +publicKeys: + "@ax": + "v1": "13ccb23efdc4fa45cb5e9b467a0344b57414b3ff136921400128bfc403a916f6" + "@simatic-ax": + "v1": "7af3e394eb2b285a3d99ab8e1f745cc6db75704b30a80393339c721a92ffffd9" catalogs: "@ax/simatic-ax": ^2510.0.0 devDependencies: From 85ea7cb92b745a27ce8207ddf71d8bc0cdbdf854 Mon Sep 17 00:00:00 2001 From: Reiner Schinkoethe Date: Fri, 14 Nov 2025 11:43:21 +0100 Subject: [PATCH 3/5] use v1 and v2 key --- apax.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/apax.yml b/apax.yml index 9457f04..f6b2955 100644 --- a/apax.yml +++ b/apax.yml @@ -26,7 +26,8 @@ publicKeys: "@ax": "v1": "13ccb23efdc4fa45cb5e9b467a0344b57414b3ff136921400128bfc403a916f6" "@simatic-ax": - "v1": "7af3e394eb2b285a3d99ab8e1f745cc6db75704b30a80393339c721a92ffffd9" + "v1": "3792a7e926775425ccdd29ceed8c368c3008b5b33d7d5550b3cb1f58093e1dff" + "v2": "7af3e394eb2b285a3d99ab8e1f745cc6db75704b30a80393339c721a92ffffd9" catalogs: "@ax/simatic-ax": ^2510.0.0 devDependencies: From c641ef9fc22d7b362f08323e776dffaeebcffd5f Mon Sep 17 00:00:00 2001 From: Reiner Schinkoethe Date: Fri, 14 Nov 2025 11:44:02 +0100 Subject: [PATCH 4/5] use new apax image --- .github/workflows/package-development-workflow.yml | 2 +- .github/workflows/package-release-workflow.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/package-development-workflow.yml b/.github/workflows/package-development-workflow.yml index 8746d89..1069ee4 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 }} diff --git a/.github/workflows/package-release-workflow.yml b/.github/workflows/package-release-workflow.yml index 38343a7..a74f726 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 }} From 4f2e74841b586587eef9ad46965de0db53ffee0a Mon Sep 17 00:00:00 2001 From: Reiner Schinkoethe Date: Fri, 14 Nov 2025 12:39:56 +0100 Subject: [PATCH 5/5] remove ax key --- apax.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/apax.yml b/apax.yml index f6b2955..1d5c940 100644 --- a/apax.yml +++ b/apax.yml @@ -23,8 +23,6 @@ targets: # Dependencies publicKeys: - "@ax": - "v1": "13ccb23efdc4fa45cb5e9b467a0344b57414b3ff136921400128bfc403a916f6" "@simatic-ax": "v1": "3792a7e926775425ccdd29ceed8c368c3008b5b33d7d5550b3cb1f58093e1dff" "v2": "7af3e394eb2b285a3d99ab8e1f745cc6db75704b30a80393339c721a92ffffd9"