From f8e44ab98d3f36a2d7f07ff826fe32cf250da7da Mon Sep 17 00:00:00 2001 From: Julien Nicoulaud Date: Mon, 23 Sep 2024 17:50:45 +0200 Subject: [PATCH] ci: use separate path --- .github/workflows/release.yml | 20 ++++++++++++++++---- .pre-commit-config.yaml | 4 ++-- pdm.lock | 6 +++--- pyproject.toml | 2 +- 4 files changed, 22 insertions(+), 10 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 4ccbc98..c965379 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -11,7 +11,7 @@ permissions: jobs: publish: - name: publish python library + name: publish artifacts timeout-minutes: 60 runs-on: ledgerhq-shared-small steps: @@ -44,18 +44,30 @@ jobs: timeout-minutes: 10 run: pdm exe - - name: Generate build attestations + - name: Generate library build attestations timeout-minutes: 10 uses: LedgerHQ/actions-security/actions/attest@actions/attest-1 with: subject-path: dist/* - - name: Sign distribution artifacts + - name: Generate application build attestations + timeout-minutes: 10 + uses: LedgerHQ/actions-security/actions/attest@actions/attest-1 + with: + subject-path: build/exe/* + + - name: Sign library artifacts timeout-minutes: 10 uses: LedgerHQ/actions-security/actions/sign-blob@actions/sign-blob-1 with: path: dist + - name: Sign application artifacts + timeout-minutes: 10 + uses: LedgerHQ/actions-security/actions/sign-blob@actions/sign-blob-1 + with: + path: build/exe + - name: Upload library artifacts to Ledger Artifactory repository timeout-minutes: 10 env: @@ -70,6 +82,6 @@ jobs: with: repo_token: ${{ secrets.GITHUB_TOKEN }} tag: ${{ github.ref }} - file: dist/erc7730 + file: build/exe/erc7730 asset_name: erc7730 overwrite: true diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 0c511f8..a8f3bb6 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -8,7 +8,7 @@ repos: name: sync pre-commit dependencies - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.6.6 + rev: v0.6.7 hooks: - id: ruff name: lint code (ruff) @@ -33,7 +33,7 @@ repos: - pytest==8.3.3 - repo: https://github.com/pdm-project/pdm - rev: 2.17.3 + rev: 2.18.2 hooks: - id: pdm-lock-check name: check pdm lock file diff --git a/pdm.lock b/pdm.lock index 35879a8..b402dea 100644 --- a/pdm.lock +++ b/pdm.lock @@ -40,7 +40,7 @@ files = [ [[package]] name = "cattrs" -version = "24.1.1" +version = "24.1.2" requires_python = ">=3.8" summary = "Composable complex class support for attrs and dataclasses." groups = ["dev"] @@ -50,8 +50,8 @@ dependencies = [ "typing-extensions!=4.6.3,>=4.1.0; python_version < \"3.11\"", ] files = [ - {file = "cattrs-24.1.1-py3-none-any.whl", hash = "sha256:ec8ce8fdc725de9d07547cd616f968670687c6fa7a2e263b088370c46d834d97"}, - {file = "cattrs-24.1.1.tar.gz", hash = "sha256:16e94a13f9aaf6438bd5be5df521e072b1b00481b4cf807bcb1acbd49f814c08"}, + {file = "cattrs-24.1.2-py3-none-any.whl", hash = "sha256:67c7495b760168d931a10233f979b28dc04daf853b30752246f4f8471c6d68d0"}, + {file = "cattrs-24.1.2.tar.gz", hash = "sha256:8028cfe1ff5382df59dd36474a86e02d817b06eaf8af84555441bac915d2ef85"}, ] [[package]] diff --git a/pyproject.toml b/pyproject.toml index 8962c4a..7532a5b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -50,7 +50,7 @@ test.shell = "pytest tests" all.help = "Run lint+test" all.shell = { composite = ["lint", "test"] } exe.help = "Package the application into a standalone executable" -exe.shell = "pdm pack --compress --exe --interpreter '/usr/bin/env python3' --output dist/erc7730" +exe.shell = "pdm pack --compress --exe --interpreter '/usr/bin/env python3' --output build/exe/erc7730" [tool.pdm] plugins = ["sync-pre-commit-lock", "pdm-packer"]