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 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-lock.json b/apax-lock.json index 97a5dee..c911e72 100644 --- a/apax-lock.json +++ b/apax-lock.json @@ -7,12 +7,12 @@ "name": "@simatic-ax/conversion", "version": "0.0.0-placeholder", "dependencies": { - "@ax/system-strings": "^10.0.24", - "@ax/system-math": "^10.0.24" + "@ax/system-strings": "^10.2.7", + "@ax/system-math": "^10.2.7" }, "devDependencies": { "@ax/sdk": "^2510.0.0", - "@simatic-ax/snippetscollection": "^1.0.0" + "@simatic-ax/snippetscollection": "^1.1.0" }, "catalogs": { "@ax/simatic-ax": "^2510.0.0" diff --git a/apax.yml b/apax.yml index 97306d9..f610a94 100644 --- a/apax.yml +++ b/apax.yml @@ -22,12 +22,18 @@ targets: # Install Setting installStrategy: strict # Dependencies +publicKeys: + "@simatic-ax": + "v1": "3792a7e926775425ccdd29ceed8c368c3008b5b33d7d5550b3cb1f58093e1dff" + "v2": "7af3e394eb2b285a3d99ab8e1f745cc6db75704b30a80393339c721a92ffffd9" +catalogs: + "@ax/simatic-ax": ^2510.0.0 devDependencies: "@ax/sdk": ^2510.0.0 - "@simatic-ax/snippetscollection": ^1.0.0 + "@simatic-ax/snippetscollection": ^1.1.0 dependencies: - "@ax/system-strings": ^10.0.24 - "@ax/system-math": ^10.0.24 + "@ax/system-strings": ^10.2.7 + "@ax/system-math": ^10.2.7 # Files, which will be shipped with the library files: - 'README.md' @@ -36,5 +42,4 @@ files: - 'snippets' - 'doc' - 'bin' # ship library with binaries -catalogs: - "@ax/simatic-ax": ^2510.0.0 +