From 84aaf770c55ee902d44f2b806a56cd9510deca7a Mon Sep 17 00:00:00 2001 From: hyperpolymath <6759885+hyperpolymath@users.noreply.github.com> Date: Fri, 18 Sep 2026 13:40:44 +0000 Subject: [PATCH] resolve: conflicts for #69 (fix/token-permissions-id-20260911) Replays the net effect of merging main into fix/token-permissions-id-20260911 with conflicts resolved in main's favour: * guix.scm kept (main replaced the {{PROJECT_NAME}} placeholder with a real package definition; the PR's deletion was stale) * standards reusable-workflow pins kept at main's newer revisions Linear single commit so it satisfies required_linear_history and squash-only merge. --- .github/workflows/codeql.yml | 2 +- .github/workflows/rhodibot.yml | 2 +- .github/workflows/rust-ci.yml | 2 +- .github/workflows/scorecard.yml | 6 +----- .github/workflows/secret-scanner.yml | 2 +- src/interface/abi/tlaiser-abi.ipkg | 4 ---- 6 files changed, 5 insertions(+), 13 deletions(-) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index f361bd6..8b6e65f 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -7,7 +7,7 @@ on: pull_request: branches: [main, master] schedule: - - cron: '0 6 * * 1' + - cron: '0 6 1 * *' # monthly 1st 06:00 UTC # Estate guardrail: cancel superseded runs so re-pushes / rebased PR # updates do not pile up queued runs against the shared account-wide diff --git a/.github/workflows/rhodibot.yml b/.github/workflows/rhodibot.yml index 45c74cc..8cd6c47 100644 --- a/.github/workflows/rhodibot.yml +++ b/.github/workflows/rhodibot.yml @@ -21,7 +21,7 @@ on: types: [completed] permissions: - contents: write + contents: read pull-requests: write jobs: diff --git a/.github/workflows/rust-ci.yml b/.github/workflows/rust-ci.yml index b1b86c6..c60e60a 100644 --- a/.github/workflows/rust-ci.yml +++ b/.github/workflows/rust-ci.yml @@ -14,4 +14,4 @@ permissions: jobs: rust-ci: - uses: hyperpolymath/standards/.github/workflows/rust-ci-reusable.yml@8dc2bf039d1ff0372d650895c46bea7fbaec68ff + uses: hyperpolymath/standards/.github/workflows/rust-ci-reusable.yml@d135b05bfc647d0c0fbfedc7e80f37ea50f49236 diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml index 11d9b2a..85b16ab 100644 --- a/.github/workflows/scorecard.yml +++ b/.github/workflows/scorecard.yml @@ -11,8 +11,4 @@ permissions: jobs: scorecard: - uses: hyperpolymath/standards/.github/workflows/scorecard-reusable.yml@81dbf2dd854b1444fd6236fa2352474383b2c2b9 - permissions: - contents: read - security-events: write - id-token: write + uses: hyperpolymath/standards/.github/workflows/scorecard-reusable.yml@d7c22711e830e1f383846472f6e9b99debdb201e \ No newline at end of file diff --git a/.github/workflows/secret-scanner.yml b/.github/workflows/secret-scanner.yml index 2ecd61d..d713d06 100644 --- a/.github/workflows/secret-scanner.yml +++ b/.github/workflows/secret-scanner.yml @@ -15,5 +15,5 @@ permissions: jobs: scan: - uses: hyperpolymath/standards/.github/workflows/secret-scanner-reusable.yml@c65436ee3351cd6b0fa14b142938b195efc77586 + uses: hyperpolymath/standards/.github/workflows/secret-scanner-reusable.yml@d135b05bfc647d0c0fbfedc7e80f37ea50f49236 secrets: inherit diff --git a/src/interface/abi/tlaiser-abi.ipkg b/src/interface/abi/tlaiser-abi.ipkg index e094b4a..debf017 100644 --- a/src/interface/abi/tlaiser-abi.ipkg +++ b/src/interface/abi/tlaiser-abi.ipkg @@ -9,7 +9,3 @@ modules = Tlaiser.ABI.Types , Tlaiser.ABI.Layout , Tlaiser.ABI.Foreign , Tlaiser.ABI.Proofs - , Tlaiser.ABI.Semantics - , Tlaiser.ABI.Invariants - , Tlaiser.ABI.FfiSeam - , Tlaiser.ABI.Capstone