From e360276d54bc5fff185014d42cc1c9cb03c07aba Mon Sep 17 00:00:00 2001 From: Reiner Schinkoethe Date: Mon, 17 Nov 2025 10:15:59 +0100 Subject: [PATCH] fix: use actions v4, new apax image and insert the using of publicKeys --- .github/workflows/package-development-workflow.yml | 10 +++++----- .github/workflows/package-release-workflow.yml | 11 ++++++----- apax.yml | 4 ++++ 3 files changed, 15 insertions(+), 10 deletions(-) diff --git a/.github/workflows/package-development-workflow.yml b/.github/workflows/package-development-workflow.yml index 63fb906..0ed80d9 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 424f17e..6beccf6 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_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 diff --git a/apax.yml b/apax.yml index ef0543f..96d294e 100644 --- a/apax.yml +++ b/apax.yml @@ -19,6 +19,10 @@ registries: '@simatic-ax': 'https://npm.pkg.github.com/' # Dependencies +publicKeys: + "@simatic-ax": + "v1": "3792a7e926775425ccdd29ceed8c368c3008b5b33d7d5550b3cb1f58093e1dff" + "v2": "7af3e394eb2b285a3d99ab8e1f745cc6db75704b30a80393339c721a92ffffd9" catalogs: "@ax/simatic-ax": ^2504.0.0