From 06a44ff37987f53a74910d40a0f3f59eac0f1865 Mon Sep 17 00:00:00 2001 From: ReinerSchinkoethe <157693339+ReinerSchinkoethe@users.noreply.github.com> Date: Mon, 10 Nov 2025 09:05:56 +0100 Subject: [PATCH 1/2] chore: update signing key to version 2 --- .github/workflows/application-example-release-workflow.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/application-example-release-workflow.yml b/.github/workflows/application-example-release-workflow.yml index 3c77358..f9eb3f4 100644 --- a/.github/workflows/application-example-release-workflow.yml +++ b/.github/workflows/application-example-release-workflow.yml @@ -59,7 +59,7 @@ jobs: - name: Pack the template uses: simatic-ax/actions/apax-pack@v3 with: - key: ${{ secrets.APAX_SIGNKEY }} + key: ${{ secrets.APAX_SIGNKEY_V2 }} path: ${{ env.TEMPLATE_PATH }} - name: Login to required registries @@ -75,4 +75,4 @@ jobs: registries: | https://npm.pkg.github.com tag: latest - path: ${{ env.TEMPLATE_PATH }} \ No newline at end of file + path: ${{ env.TEMPLATE_PATH }} From 12b561623467ed6d15a1bd7cac6c8cd49b1e6d82 Mon Sep 17 00:00:00 2001 From: Reiner Schinkoethe Date: Wed, 19 Nov 2025 08:13:06 +0100 Subject: [PATCH 2/2] fix: use v4 actions, new image and add publicKeys for use --- .../application-example-release-workflow.yml | 15 ++++++++------- .../workflows/package-development-workflow.yml | 10 +++++----- apax.yml | 10 +++++++--- 3 files changed, 20 insertions(+), 15 deletions(-) diff --git a/.github/workflows/application-example-release-workflow.yml b/.github/workflows/application-example-release-workflow.yml index f9eb3f4..fdd0bf8 100644 --- a/.github/workflows/application-example-release-workflow.yml +++ b/.github/workflows/application-example-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 }} @@ -41,36 +41,37 @@ jobs: fetch-depth: 0 - 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: Templatify repository - uses: simatic-ax/actions/apax-templatify@v3 + uses: simatic-ax/actions/apax-templatify@v4 with: version: ${{ github.event.release.tag_name }} - name: Version package - uses: simatic-ax/actions/apax-version@v3 + uses: simatic-ax/actions/apax-version@v4 with: version: ${{ github.event.release.tag_name }} path: ${{ env.TEMPLATE_PATH }}/template - name: Pack the template - uses: simatic-ax/actions/apax-pack@v3 + uses: simatic-ax/actions/apax-pack@v4 with: key: ${{ secrets.APAX_SIGNKEY_V2 }} + key-version: "v2" path: ${{ env.TEMPLATE_PATH }} - 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 diff --git a/.github/workflows/package-development-workflow.yml b/.github/workflows/package-development-workflow.yml index fb6b298..bb3046b 100644 --- a/.github/workflows/package-development-workflow.yml +++ b/.github/workflows/package-development-workflow.yml @@ -25,7 +25,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 }} @@ -36,22 +36,22 @@ 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 - name: Test source code - uses: simatic-ax/actions/apax-test@v3 + uses: simatic-ax/actions/apax-test@v4 - name: Check links uses: gaurav-nelson/github-action-markdown-link-check@v1 diff --git a/apax.yml b/apax.yml index 880e5ac..f048eb1 100644 --- a/apax.yml +++ b/apax.yml @@ -20,12 +20,16 @@ scripts: dlplc: - apax build - apax load +publicKeys: + "@simatic-ax": + "v1": "3792a7e926775425ccdd29ceed8c368c3008b5b33d7d5550b3cb1f58093e1dff" + "v2": "7af3e394eb2b285a3d99ab8e1f745cc6db75704b30a80393339c721a92ffffd9" +catalogs: + "@ax/simatic-ax": ^2510.0.0 devDependencies: "@ax/sdk": ^2510.0.0 "@simatic-ax/snippetscollection": ^1.1.0 registries: '@simatic-ax': 'https://npm.pkg.github.com/' dependencies: - "@simatic-ax/windowtracking": ^6.0.1 -catalogs: - "@ax/simatic-ax": ^2510.0.0 + "@simatic-ax/windowtracking": ^6.0.1 \ No newline at end of file