From 435e46418c3942f9cb9c71f58fdff81e77eb5f37 Mon Sep 17 00:00:00 2001 From: Reiner Schinkoethe Date: Mon, 17 Nov 2025 10:38:34 +0100 Subject: [PATCH 1/3] Chore: add vs to gitignore --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 93a4bd8..30b575f 100644 --- a/.gitignore +++ b/.gitignore @@ -5,4 +5,5 @@ obj TestResult *.tgz assets -EXPORT.yml \ No newline at end of file +EXPORT.yml +/.vs From d70c4e627ec09dd0cd9c25d8f68c843686c60363 Mon Sep 17 00:00:00 2001 From: Reiner Schinkoethe Date: Mon, 17 Nov 2025 10:40:28 +0100 Subject: [PATCH 2/3] fix: use actions version 4 for correct handling of signing keys and update apax image --- .github/workflows/package-development-workflow.yml | 10 +++++----- .github/workflows/package-release-workflow.yml | 11 ++++++----- apax.yml | 13 ++++++++----- 3 files changed, 19 insertions(+), 15 deletions(-) diff --git a/.github/workflows/package-development-workflow.yml b/.github/workflows/package-development-workflow.yml index 3df12d5..b18fed0 100644 --- a/.github/workflows/package-development-workflow.yml +++ b/.github/workflows/package-development-workflow.yml @@ -30,7 +30,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 }} @@ -42,19 +42,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 @@ -64,7 +64,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..d85b0bf 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-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/apax.yml b/apax.yml index 571b5d0..7c2dfdf 100644 --- a/apax.yml +++ b/apax.yml @@ -18,10 +18,17 @@ targets: registries: '@simatic-ax': 'https://npm.pkg.github.com/' # Dependencies +publicKeys: + "@simatic-ax": + "v1": "3792a7e926775425ccdd29ceed8c368c3008b5b33d7d5550b3cb1f58093e1dff" + "v2": "7af3e394eb2b285a3d99ab8e1f745cc6db75704b30a80393339c721a92ffffd9" +catalogs: + "@ax/simatic-ax": ^2504.0.0 devDependencies: '@ax/sdk': ^2504.0.0 "@simatic-ax/snippetscollection": ^1.0.0 - +dependencies: + "@ax/system-strings": ^10.0.24 # Project variables variables: APAX_BUILD_ARGS: @@ -34,7 +41,3 @@ files: - 'docs' - 'bin' - 'snippets' -dependencies: - "@ax/system-strings": ^10.0.24 -catalogs: - "@ax/simatic-ax": ^2504.0.0 From f7f35cdc448b18e95e6a505f4ffaf3583fd7dcd4 Mon Sep 17 00:00:00 2001 From: Reiner Schinkoethe Date: Mon, 17 Nov 2025 10:43:14 +0100 Subject: [PATCH 3/3] us new signing key --- .github/workflows/package-release-workflow.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/package-release-workflow.yml b/.github/workflows/package-release-workflow.yml index d85b0bf..6949a33 100644 --- a/.github/workflows/package-release-workflow.yml +++ b/.github/workflows/package-release-workflow.yml @@ -56,7 +56,7 @@ jobs: - name: Package source code 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