From 1623168895ca278c4b7fe96f1ab68fc822b7b7c0 Mon Sep 17 00:00:00 2001 From: rborsaru-ansys Date: Thu, 12 Jun 2025 12:12:07 +0300 Subject: [PATCH 01/21] Creating new branch to test the wheels with underscores --- .github/workflows/ci_cd_pr.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/ci_cd_pr.yml b/.github/workflows/ci_cd_pr.yml index 76b93f241..4341b9459 100644 --- a/.github/workflows/ci_cd_pr.yml +++ b/.github/workflows/ci_cd_pr.yml @@ -233,3 +233,11 @@ jobs: token: ${{ secrets.GITHUB_TOKEN }} auditing-level: 'high' trust-ansys-actions: true + build-library: + name: "Build library basic example" + runs-on: ubuntu-latest + steps: + - name: "Build library source and wheel artifacts" + uses: ansys/actions/build-library@fix/unify-artifacts-file-names + with: + library-name: "ansys-actions-core" \ No newline at end of file From 8d73f86cf8232aeeb4bf6550b8c45c2c663ef7ae Mon Sep 17 00:00:00 2001 From: rborsaru-ansys Date: Thu, 12 Jun 2025 12:28:57 +0300 Subject: [PATCH 02/21] Adding the working-directory input to be able to find the toml file --- .github/workflows/ci_cd_pr.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci_cd_pr.yml b/.github/workflows/ci_cd_pr.yml index 4341b9459..faf7f80ed 100644 --- a/.github/workflows/ci_cd_pr.yml +++ b/.github/workflows/ci_cd_pr.yml @@ -240,4 +240,5 @@ jobs: - name: "Build library source and wheel artifacts" uses: ansys/actions/build-library@fix/unify-artifacts-file-names with: - library-name: "ansys-actions-core" \ No newline at end of file + library-name: "ansys-actions-core" + working-directory: ".ci/ansys-actions" \ No newline at end of file From 7ea50fa89cc38be32a12d8062ab160956b5c901e Mon Sep 17 00:00:00 2001 From: rborsaru-ansys Date: Thu, 12 Jun 2025 12:56:22 +0300 Subject: [PATCH 03/21] Fix for working folder --- .github/workflows/ci_cd_pr.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci_cd_pr.yml b/.github/workflows/ci_cd_pr.yml index faf7f80ed..3ca812183 100644 --- a/.github/workflows/ci_cd_pr.yml +++ b/.github/workflows/ci_cd_pr.yml @@ -240,5 +240,5 @@ jobs: - name: "Build library source and wheel artifacts" uses: ansys/actions/build-library@fix/unify-artifacts-file-names with: - library-name: "ansys-actions-core" - working-directory: ".ci/ansys-actions" \ No newline at end of file + library-name: ${{ env.LIBRARY_NAME }} + working-directory: ".ci" \ No newline at end of file From 1bf8a6d4361e142f3037f1f6f6c091fbb3b042bb Mon Sep 17 00:00:00 2001 From: rborsaru-ansys Date: Fri, 13 Jun 2025 17:04:02 +0300 Subject: [PATCH 04/21] Trying a new path for working directory --- .github/workflows/ci_cd_pr.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci_cd_pr.yml b/.github/workflows/ci_cd_pr.yml index 3ca812183..4c025de82 100644 --- a/.github/workflows/ci_cd_pr.yml +++ b/.github/workflows/ci_cd_pr.yml @@ -241,4 +241,4 @@ jobs: uses: ansys/actions/build-library@fix/unify-artifacts-file-names with: library-name: ${{ env.LIBRARY_NAME }} - working-directory: ".ci" \ No newline at end of file + working-directory: ${{ github.workspace }}/.ci/ansys-actions \ No newline at end of file From 59282513ed48e26db268b594b3b1096d01b2ee7d Mon Sep 17 00:00:00 2001 From: rborsaru-ansys Date: Mon, 16 Jun 2025 10:40:53 +0300 Subject: [PATCH 05/21] Remove changes from ci_cd as these cannot be tested --- .github/workflows/ci_cd_pr.yml | 9 --------- 1 file changed, 9 deletions(-) diff --git a/.github/workflows/ci_cd_pr.yml b/.github/workflows/ci_cd_pr.yml index 4c025de82..76b93f241 100644 --- a/.github/workflows/ci_cd_pr.yml +++ b/.github/workflows/ci_cd_pr.yml @@ -233,12 +233,3 @@ jobs: token: ${{ secrets.GITHUB_TOKEN }} auditing-level: 'high' trust-ansys-actions: true - build-library: - name: "Build library basic example" - runs-on: ubuntu-latest - steps: - - name: "Build library source and wheel artifacts" - uses: ansys/actions/build-library@fix/unify-artifacts-file-names - with: - library-name: ${{ env.LIBRARY_NAME }} - working-directory: ${{ github.workspace }}/.ci/ansys-actions \ No newline at end of file From 0ee82ce46c512203bed212aa3a8d9c3483a926c3 Mon Sep 17 00:00:00 2001 From: pyansys-ci-bot <92810346+pyansys-ci-bot@users.noreply.github.com> Date: Mon, 16 Jun 2025 07:54:40 +0000 Subject: [PATCH 06/21] chore: adding changelog file 907.added.md [dependabot-skip] --- doc/source/changelog/907.added.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 doc/source/changelog/907.added.md diff --git a/doc/source/changelog/907.added.md b/doc/source/changelog/907.added.md new file mode 100644 index 000000000..66c189395 --- /dev/null +++ b/doc/source/changelog/907.added.md @@ -0,0 +1 @@ +Generate wheels package with underscores instead of dashes \ No newline at end of file From 4baf6dcae4b03a0808c38e60bc77f1eae880c4ff Mon Sep 17 00:00:00 2001 From: rborsaru-ansys Date: Mon, 16 Jun 2025 11:03:29 +0300 Subject: [PATCH 07/21] Change wheel package name from dashes to underscores --- build-wheelhouse/action.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/build-wheelhouse/action.yml b/build-wheelhouse/action.yml index 798c6d093..295ddc9af 100644 --- a/build-wheelhouse/action.yml +++ b/build-wheelhouse/action.yml @@ -385,20 +385,20 @@ runs: uses: vimtor/action-zip@1379ea20d4c5705669ba81fd626dd01b1c738f26 # v1.2 with: files: wheelhouse - dest: ${{ inputs.library-name }}-v${{ steps.library-version.outputs.library_version }}-${{ steps.specific-target-requested.outputs.wheelhouse_target }}-${{ inputs.operating-system }}-${{ inputs.python-version }}.zip + dest: ${{ inputs.library-name }}_v${{ steps.library-version.outputs.library_version }}_${{ steps.specific-target-requested.outputs.wheelhouse_target }}_${{ inputs.operating-system }}_${{ inputs.python-version }}.zip - name: "Upload the compressed wheelhouse" uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2 with: - name: ${{ inputs.library-name }}-v${{ steps.library-version.outputs.library_version }}-${{ steps.specific-target-requested.outputs.wheelhouse_target }}-${{ inputs.operating-system }}-${{ inputs.python-version }} - path: ${{ inputs.library-name }}-v${{ steps.library-version.outputs.library_version }}-${{ steps.specific-target-requested.outputs.wheelhouse_target }}-${{ inputs.operating-system }}-${{ inputs.python-version }}.zip + name: ${{ inputs.library-name }}_v${{ steps.library-version.outputs.library_version }}_${{ steps.specific-target-requested.outputs.wheelhouse_target }}_${{ inputs.operating-system }}_${{ inputs.python-version }} + path: ${{ inputs.library-name }}_v${{ steps.library-version.outputs.library_version }}_${{ steps.specific-target-requested.outputs.wheelhouse_target }}_${{ inputs.operating-system }}_${{ inputs.python-version }}.zip retention-days: 7 - name: Generate build provenance attestation if: inputs.attest-provenance == 'true' uses: actions/attest-build-provenance@db473fddc028af60658334401dc6fa3ffd8669fd # v2.3.0 with: - subject-path: ${{ inputs.library-name }}-v${{ steps.library-version.outputs.library_version }}-${{ steps.specific-target-requested.outputs.wheelhouse_target }}-${{ inputs.operating-system }}-${{ inputs.python-version }}.zip + subject-path: ${{ inputs.library-name }}_v${{ steps.library-version.outputs.library_version }}_${{ steps.specific-target-requested.outputs.wheelhouse_target }}_${{ inputs.operating-system }}_${{ inputs.python-version }}.zip - name: Check library's dependencies license uses: ansys/actions/check-licenses@main From 26725d38ee60c01a5105e38f5d27ac463572468a Mon Sep 17 00:00:00 2001 From: Jorge Martinez Date: Mon, 16 Jun 2025 14:04:27 +0200 Subject: [PATCH 08/21] ci(workflow): test wheelhouse --- .github/workflows/ci_cd_night.yml | 18 ++++++++++++++++++ .github/workflows/ci_cd_pr.yml | 20 +++++++++++++++++++- .github/workflows/ci_cd_release.yml | 18 ++++++++++++++++++ 3 files changed, 55 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci_cd_night.yml b/.github/workflows/ci_cd_night.yml index affb6ea1e..0843f074c 100644 --- a/.github/workflows/ci_cd_night.yml +++ b/.github/workflows/ci_cd_night.yml @@ -42,9 +42,27 @@ jobs: bot-user: ${{ secrets.PYANSYS_CI_BOT_USERNAME }} bot-email: ${{ secrets.PYANSYS_CI_BOT_EMAIL }} + wheelhouse: + name: "Wheelhouse / ${{ matrix.os }} / ${{ matrix.python }}" + runs-on: ${{ matrix.os }} + if: github.event.action != 'closed' + permissions: + id-token: write + contents: write + strategy: + fail-fast: false + matrix: + os: ['ubuntu-latest', 'windows-latest'] + python: ['3.10', '3.11', '3.12', '3.13'] + steps: + - uses: ansys/actions/build-wheelhouse@fix/unify-artifacts-file-names + with: + working-directory: .ci/ansys-actions + tests: name: "Tests" runs-on: ubuntu-latest + needs: wheelhouse permissions: id-token: write contents: write diff --git a/.github/workflows/ci_cd_pr.yml b/.github/workflows/ci_cd_pr.yml index 76b93f241..f67c6285a 100644 --- a/.github/workflows/ci_cd_pr.yml +++ b/.github/workflows/ci_cd_pr.yml @@ -156,10 +156,28 @@ jobs: bot-email: ${{ secrets.PYANSYS_CI_BOT_EMAIL }} maximum-pr-doc-deployments: 10 + wheelhouse: + name: "Wheelhouse / ${{ matrix.os }} / ${{ matrix.python }}" + runs-on: ${{ matrix.os }} + needs: code-style + if: github.event.action != 'closed' + permissions: + id-token: write + contents: write + strategy: + fail-fast: false + matrix: + os: ['ubuntu-latest', 'windows-latest'] + python: ['3.10', '3.11', '3.12', '3.13'] + steps: + - uses: ansys/actions/build-wheelhouse@fix/unify-artifacts-file-names + with: + working-directory: .ci/ansys-actions + tests: name: "Tests" runs-on: ubuntu-latest - needs: code-style + needs: wheelhouse if: github.event.action != 'closed' permissions: id-token: write diff --git a/.github/workflows/ci_cd_release.yml b/.github/workflows/ci_cd_release.yml index 089d3e410..70f20b8e7 100644 --- a/.github/workflows/ci_cd_release.yml +++ b/.github/workflows/ci_cd_release.yml @@ -142,6 +142,24 @@ jobs: use-python-cache: false needs-quarto: true + wheelhouse: + name: "Wheelhouse / ${{ matrix.os }} / ${{ matrix.python }}" + runs-on: ${{ matrix.os }} + needs: code-style + if: github.event.action != 'closed' + permissions: + id-token: write + contents: write + strategy: + fail-fast: false + matrix: + os: ['ubuntu-latest', 'windows-latest'] + python: ['3.10', '3.11', '3.12', '3.13'] + steps: + - uses: ansys/actions/build-wheelhouse@fix/unify-artifacts-file-names + with: + working-directory: .ci/ansys-actions + tests: name: "Tests" runs-on: ubuntu-latest From b1acf80aa41dfe775fb6bc96c7987482d6369208 Mon Sep 17 00:00:00 2001 From: rborsaru-ansys Date: Mon, 16 Jun 2025 16:46:30 +0300 Subject: [PATCH 09/21] Try to add wheel build during ci_cd run --- .github/workflows/ci_cd_pr.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci_cd_pr.yml b/.github/workflows/ci_cd_pr.yml index f67c6285a..ad074f19f 100644 --- a/.github/workflows/ci_cd_pr.yml +++ b/.github/workflows/ci_cd_pr.yml @@ -172,8 +172,10 @@ jobs: steps: - uses: ansys/actions/build-wheelhouse@fix/unify-artifacts-file-names with: + library-name: ${{ env.PACKAGE_NAME }} + operating-system: ${{ matrix.os }} + python-version: ${{ matrix.python-version }} working-directory: .ci/ansys-actions - tests: name: "Tests" runs-on: ubuntu-latest From 3cea84fbd82d99002db7cf781e44093aafc7fee1 Mon Sep 17 00:00:00 2001 From: rborsaru-ansys Date: Mon, 16 Jun 2025 17:05:29 +0300 Subject: [PATCH 10/21] Change matrix name from python-version to python --- .github/workflows/ci_cd_pr.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci_cd_pr.yml b/.github/workflows/ci_cd_pr.yml index ad074f19f..23d117a9d 100644 --- a/.github/workflows/ci_cd_pr.yml +++ b/.github/workflows/ci_cd_pr.yml @@ -174,7 +174,7 @@ jobs: with: library-name: ${{ env.PACKAGE_NAME }} operating-system: ${{ matrix.os }} - python-version: ${{ matrix.python-version }} + python-version: ${{ matrix.python }} working-directory: .ci/ansys-actions tests: name: "Tests" From 5ee29191d374dcd23419e57a35754f0207473110 Mon Sep 17 00:00:00 2001 From: rborsaru-ansys Date: Mon, 16 Jun 2025 18:01:42 +0300 Subject: [PATCH 11/21] Change env name from PACKAGE_NAME to LIBRARY_NAME --- .github/workflows/ci_cd_pr.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci_cd_pr.yml b/.github/workflows/ci_cd_pr.yml index 23d117a9d..c9f64af30 100644 --- a/.github/workflows/ci_cd_pr.yml +++ b/.github/workflows/ci_cd_pr.yml @@ -172,7 +172,7 @@ jobs: steps: - uses: ansys/actions/build-wheelhouse@fix/unify-artifacts-file-names with: - library-name: ${{ env.PACKAGE_NAME }} + library-name: ${{ env.LIBRARY_NAME }} operating-system: ${{ matrix.os }} python-version: ${{ matrix.python }} working-directory: .ci/ansys-actions From a4652c5e87048920e57e6bd2b4dba1a003c5d7a9 Mon Sep 17 00:00:00 2001 From: rborsaru-ansys Date: Mon, 16 Jun 2025 18:36:06 +0300 Subject: [PATCH 12/21] Change env LIBRARY_NAME to ansys-actions-core --- .github/workflows/ci_cd_pr.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci_cd_pr.yml b/.github/workflows/ci_cd_pr.yml index c9f64af30..9a9ff6abb 100644 --- a/.github/workflows/ci_cd_pr.yml +++ b/.github/workflows/ci_cd_pr.yml @@ -5,7 +5,7 @@ on: env: MAIN_PYTHON_VERSION: '3.12' - LIBRARY_NAME: 'ansys-actions' + LIBRARY_NAME: 'ansys-actions-core' DOCUMENTATION_CNAME: 'actions.docs.ansys.com' permissions: From 6b970fa6b748d6c6498ffc3d847a1519b5cf510f Mon Sep 17 00:00:00 2001 From: rborsaru-ansys Date: Wed, 18 Jun 2025 15:09:32 +0300 Subject: [PATCH 13/21] Adding package library step after wheelhouse step --- .github/workflows/ci_cd_pr.yml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/.github/workflows/ci_cd_pr.yml b/.github/workflows/ci_cd_pr.yml index 9a9ff6abb..6e162064b 100644 --- a/.github/workflows/ci_cd_pr.yml +++ b/.github/workflows/ci_cd_pr.yml @@ -176,6 +176,19 @@ jobs: operating-system: ${{ matrix.os }} python-version: ${{ matrix.python }} working-directory: .ci/ansys-actions + + package: + name: "Package library" + needs: [wheelhouse] + runs-on: ubuntu-22.04 + steps: + - name: "Build library source and wheel artifacts" + uses: ansys/actions/build-library@fix/unify-artifacts-file-names + with: + library-name: ${{ env.LIBRARY_NAME }} + python-version: ${{ env.MAIN_PYTHON_VERSION }} + working-directory: .ci/ansys-actions + tests: name: "Tests" runs-on: ubuntu-latest From d7ba28a30d68e9c71955963eb3c87d59413d759c Mon Sep 17 00:00:00 2001 From: rborsaru-ansys Date: Wed, 18 Jun 2025 15:14:53 +0300 Subject: [PATCH 14/21] syntax errror inside needs statement --- .github/workflows/ci_cd_pr.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci_cd_pr.yml b/.github/workflows/ci_cd_pr.yml index 6e162064b..6982bdf5f 100644 --- a/.github/workflows/ci_cd_pr.yml +++ b/.github/workflows/ci_cd_pr.yml @@ -179,7 +179,7 @@ jobs: package: name: "Package library" - needs: [wheelhouse] + needs: wheelhouse runs-on: ubuntu-22.04 steps: - name: "Build library source and wheel artifacts" From 8018041bb7544756acdcafcf05f468eca8d4383a Mon Sep 17 00:00:00 2001 From: rborsaru-ansys Date: Wed, 18 Jun 2025 15:27:24 +0300 Subject: [PATCH 15/21] changed job name --- .github/workflows/ci_cd_pr.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci_cd_pr.yml b/.github/workflows/ci_cd_pr.yml index 6982bdf5f..29436f0fe 100644 --- a/.github/workflows/ci_cd_pr.yml +++ b/.github/workflows/ci_cd_pr.yml @@ -177,7 +177,7 @@ jobs: python-version: ${{ matrix.python }} working-directory: .ci/ansys-actions - package: + package-library: name: "Package library" needs: wheelhouse runs-on: ubuntu-22.04 @@ -188,7 +188,7 @@ jobs: library-name: ${{ env.LIBRARY_NAME }} python-version: ${{ env.MAIN_PYTHON_VERSION }} working-directory: .ci/ansys-actions - + tests: name: "Tests" runs-on: ubuntu-latest From 5605e6831f7313d40868db1304445b6bd5609251 Mon Sep 17 00:00:00 2001 From: rborsaru-ansys Date: Wed, 18 Jun 2025 15:35:57 +0300 Subject: [PATCH 16/21] removing package lib step to check if code style fails --- .github/workflows/ci_cd_pr.yml | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/.github/workflows/ci_cd_pr.yml b/.github/workflows/ci_cd_pr.yml index 29436f0fe..6ee03888a 100644 --- a/.github/workflows/ci_cd_pr.yml +++ b/.github/workflows/ci_cd_pr.yml @@ -176,19 +176,7 @@ jobs: operating-system: ${{ matrix.os }} python-version: ${{ matrix.python }} working-directory: .ci/ansys-actions - - package-library: - name: "Package library" - needs: wheelhouse - runs-on: ubuntu-22.04 - steps: - - name: "Build library source and wheel artifacts" - uses: ansys/actions/build-library@fix/unify-artifacts-file-names - with: - library-name: ${{ env.LIBRARY_NAME }} - python-version: ${{ env.MAIN_PYTHON_VERSION }} - working-directory: .ci/ansys-actions - + tests: name: "Tests" runs-on: ubuntu-latest From c0e9907ae099399a6bd8aedf43bde8e9191efad2 Mon Sep 17 00:00:00 2001 From: rborsaru-ansys Date: Wed, 18 Jun 2025 15:45:44 +0300 Subject: [PATCH 17/21] adding the job without trailing spaces --- .github/workflows/ci_cd_pr.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.github/workflows/ci_cd_pr.yml b/.github/workflows/ci_cd_pr.yml index 6ee03888a..80b50a92c 100644 --- a/.github/workflows/ci_cd_pr.yml +++ b/.github/workflows/ci_cd_pr.yml @@ -177,6 +177,18 @@ jobs: python-version: ${{ matrix.python }} working-directory: .ci/ansys-actions + package-library: + name: "Package library" + needs: wheelhouse + runs-on: ubuntu-22.04 + steps: + - name: "Build library source and wheel artifacts" + uses: ansys/actions/build-library@fix/unify-artifacts-file-names + with: + library-name: ${{ env.LIBRARY_NAME }} + python-version: ${{ env.MAIN_PYTHON_VERSION }} + working-directory: .ci/ansys-actions + tests: name: "Tests" runs-on: ubuntu-latest From 9fd5b9d2a0fbf4da06a9b763e08d7c2f55b812fc Mon Sep 17 00:00:00 2001 From: rborsaru-ansys Date: Wed, 18 Jun 2025 16:47:16 +0300 Subject: [PATCH 18/21] adding working-directory to build-library action --- build-library/action.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build-library/action.yml b/build-library/action.yml index db5a9219b..5a49f062d 100644 --- a/build-library/action.yml +++ b/build-library/action.yml @@ -120,8 +120,9 @@ runs: shell: bash env: INSTALL_COMMAND: ${{ inputs.use-uv == 'true' && 'uv pip install --no-managed-python --system' || 'python -m pip install' }} + WORKING_DIRECTORY: ${{ inputs.working-directory }} run: | - $INSTALL_COMMAND . + $INSTALL_COMMAND $WORKING_DIRECTORY - name: "Ensure tag version matches metadata version when triggered by push of tags" if: github.event_name == 'push' && contains(github.ref, 'refs/tags') From 7a882df3d17c8a8ab9f7f8928d2d96a5c9ebfe9b Mon Sep 17 00:00:00 2001 From: rborsaru-ansys Date: Wed, 18 Jun 2025 17:24:21 +0300 Subject: [PATCH 19/21] changed the sbom file name from dash to underscore --- build-wheelhouse/action.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build-wheelhouse/action.yml b/build-wheelhouse/action.yml index 295ddc9af..2d7a3367e 100644 --- a/build-wheelhouse/action.yml +++ b/build-wheelhouse/action.yml @@ -341,13 +341,13 @@ runs: ~/.local/bin/syft .venv --source-name "${LIBRARY_NAME}" --source-version "${LIBRARY_VERSION}" -o spdx > sbom.spdx echo "Renaming SBOM file..." - mv sbom.spdx "${LIBRARY_NAME}-v${LIBRARY_VERSION}-${WHEELHOUSE_TARGET}-${OPERATING_SYSTEM}-${PYTHON_VERSION}-sbom.spdx" + mv sbom.spdx "${LIBRARY_NAME}_v${LIBRARY_VERSION}_${WHEELHOUSE_TARGET}_${OPERATING_SYSTEM}_${PYTHON_VERSION}_sbom.spdx" - name: "Upload the SBOM file" uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2 with: - name: ${{ inputs.library-name }}-v${{ steps.library-version.outputs.library_version }}-${{ steps.specific-target-requested.outputs.wheelhouse_target }}-${{ inputs.operating-system }}-${{ inputs.python-version }}-sbom - path: ${{ inputs.library-name }}-v${{ steps.library-version.outputs.library_version }}-${{ steps.specific-target-requested.outputs.wheelhouse_target }}-${{ inputs.operating-system }}-${{ inputs.python-version }}-sbom.spdx + name: ${{ inputs.library-name }}_v${{ steps.library-version.outputs.library_version }}_${{ steps.specific-target-requested.outputs.wheelhouse_target }}_${{ inputs.operating-system }}_${{ inputs.python-version }}_sbom + path: ${{ inputs.library-name }}_v${{ steps.library-version.outputs.library_version }}_${{ steps.specific-target-requested.outputs.wheelhouse_target }}_${{ inputs.operating-system }}_${{ inputs.python-version }}_sbom.spdx retention-days: 7 - name: Generate build provenance attestation From 8647470be7453383bab4d7bb6b3c1635d0ae8f20 Mon Sep 17 00:00:00 2001 From: rborsaru-ansys Date: Thu, 19 Jun 2025 15:28:38 +0300 Subject: [PATCH 20/21] Change library name to ansys-actions --- .ci/ansys-actions/pyproject.toml | 4 ++-- .ci/ansys-actions/src/ansys/actions/{core => }/__init__.py | 0 .github/workflows/ci_cd_pr.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) rename .ci/ansys-actions/src/ansys/actions/{core => }/__init__.py (100%) diff --git a/.ci/ansys-actions/pyproject.toml b/.ci/ansys-actions/pyproject.toml index d3ee31711..287c36905 100644 --- a/.ci/ansys-actions/pyproject.toml +++ b/.ci/ansys-actions/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "flit_core.buildapi" [project] # Check https://flit.readthedocs.io/en/latest/pyproject_toml.html for all available sections -name = "ansys-actions-core" +name = "ansys-actions" version = "10.1.dev0" description = "A demo library for testing Ansys actions" readme = "README.rst" @@ -24,7 +24,7 @@ classifiers = [ dependencies = ["importlib-metadata >=4.0"] [tool.flit.module] -name = "ansys.actions.core" +name = "ansys.actions" [project.urls] Source = "https://github.com/ansys/actions" diff --git a/.ci/ansys-actions/src/ansys/actions/core/__init__.py b/.ci/ansys-actions/src/ansys/actions/__init__.py similarity index 100% rename from .ci/ansys-actions/src/ansys/actions/core/__init__.py rename to .ci/ansys-actions/src/ansys/actions/__init__.py diff --git a/.github/workflows/ci_cd_pr.yml b/.github/workflows/ci_cd_pr.yml index 80b50a92c..807d2bceb 100644 --- a/.github/workflows/ci_cd_pr.yml +++ b/.github/workflows/ci_cd_pr.yml @@ -5,7 +5,7 @@ on: env: MAIN_PYTHON_VERSION: '3.12' - LIBRARY_NAME: 'ansys-actions-core' + LIBRARY_NAME: 'ansys-actions' DOCUMENTATION_CNAME: 'actions.docs.ansys.com' permissions: From 7bc9e851e608f6d1414097f79f3797dd8c9430c2 Mon Sep 17 00:00:00 2001 From: rborsaru-ansys Date: Thu, 19 Jun 2025 15:46:27 +0300 Subject: [PATCH 21/21] Removing package-library as this is done part of the tests job --- .github/workflows/ci_cd_pr.yml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/ci_cd_pr.yml b/.github/workflows/ci_cd_pr.yml index 807d2bceb..c7adede73 100644 --- a/.github/workflows/ci_cd_pr.yml +++ b/.github/workflows/ci_cd_pr.yml @@ -177,17 +177,17 @@ jobs: python-version: ${{ matrix.python }} working-directory: .ci/ansys-actions - package-library: - name: "Package library" - needs: wheelhouse - runs-on: ubuntu-22.04 - steps: - - name: "Build library source and wheel artifacts" - uses: ansys/actions/build-library@fix/unify-artifacts-file-names - with: - library-name: ${{ env.LIBRARY_NAME }} - python-version: ${{ env.MAIN_PYTHON_VERSION }} - working-directory: .ci/ansys-actions + # package-library: + # name: "Package library" + # needs: wheelhouse + # runs-on: ubuntu-22.04 + # steps: + # - name: "Build library source and wheel artifacts" + # uses: ansys/actions/build-library@fix/unify-artifacts-file-names + # with: + # library-name: ${{ env.LIBRARY_NAME }} + # python-version: ${{ env.MAIN_PYTHON_VERSION }} + # working-directory: .ci/ansys-actions tests: name: "Tests"