Skip to content

Commit ea09394

Browse files
authored
Merge branch 'mainline' into phase1-containers
2 parents 1db1011 + 9d8f7b8 commit ea09394

29 files changed

Lines changed: 216 additions & 47 deletions

‎.github/dependabot.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,10 @@ updates:
1212
day: "monday"
1313
commit-message:
1414
prefix: "chore(deps):"
15+
ignore:
16+
# black 26+ drops Python 3.9 compat and produces different formatting
17+
- dependency-name: "black"
18+
update-types: ["version-update:semver-major"]
1519
- package-ecosystem: "github-actions"
1620
directory: "/" # Location of package manifests
1721
schedule:
Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
# Stage 2 caller for the Claude PR-review integration: the "review" workflow.
2+
#
3+
# Triggered by completion of the Stage-1 "collect" workflow. Because the trigger
4+
# is workflow_run, GitHub runs this file from the default branch (never a fork's
5+
# copy) and with this repo's secrets -- so a fork PR cannot alter the review
6+
# behavior, permissions, or credential setup.
7+
#
8+
# All the review logic (Bedrock auth, the pinned action, the restricted tool
9+
# surface, the read-only PR-head checkout, and per-run limits) lives in the
10+
# reusable workflow in aws-deadline/.github. This caller only forwards the
11+
# workflow_run identifiers and the role-ARN secret.
12+
name: Claude PR Review
13+
14+
on:
15+
workflow_run:
16+
workflows: ["Claude PR Review (collect)"]
17+
types:
18+
- completed
19+
20+
# Cancel a superseded review when the PR is pushed again, keyed on the trusted head repo + branch from the workflow_run payload (no pull_request.number here).
21+
concurrency:
22+
group: claude-pr-review-${{ github.event.workflow_run.head_repository.full_name }}-${{ github.event.workflow_run.head_branch }}
23+
cancel-in-progress: true
24+
25+
# Least privilege. The reusable workflow re-declares the same scopes on its job;
26+
# these are the ceiling for the called workflow.
27+
permissions:
28+
contents: read
29+
pull-requests: write
30+
issues: write
31+
id-token: write
32+
33+
jobs:
34+
review:
35+
# Only run if Stage 1 succeeded, and only for runs triggered by a
36+
# pull_request. The collect workflow listens on pull_request alone today, but
37+
# gating on the event here is defense in depth: if another trigger
38+
# (workflow_dispatch, schedule, ...) is ever added to the collect workflow,
39+
# this prevents a review from firing -- with the base repo's secrets and a
40+
# fork-controlled head_sha -- from a non-PR context.
41+
if: ${{ github.event.workflow_run.conclusion == 'success' && github.event.workflow_run.event == 'pull_request' }}
42+
uses: aws-deadline/.github/.github/workflows/reusable_claude_pr_review.yml@mainline
43+
permissions:
44+
contents: read
45+
pull-requests: write
46+
issues: write
47+
id-token: write
48+
with:
49+
# Head repo and head SHA come from the server-populated workflow_run event
50+
# payload, which a fork cannot forge. The review stage resolves the PR
51+
# number and base SHA from these, so nothing fork-controlled is trusted.
52+
head_repository: ${{ github.event.workflow_run.head_repository.full_name }}
53+
head_sha: ${{ github.event.workflow_run.head_sha }}
54+
secrets:
55+
# OIDC role that can mint a Bedrock bearer token.
56+
bedrock_role_arn: ${{ secrets.AWS_CLAUDE_PR_REVIEW_ROLE }}
Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
# Stage 1 trigger for the Claude PR-review integration: the "collect" workflow.
2+
#
3+
# Runs on pull_request. For PRs from forks GitHub provides no secrets and a
4+
# read-only GITHUB_TOKEN. This stage does no work and records nothing -- it
5+
# exists only so that its completion fires the workflow_run event that starts
6+
# the review stage (claude_pr_review.yml).
7+
#
8+
# Crucially, this stage produces NO data that the review stage trusts. The
9+
# review stage derives the PR number, head SHA, and base SHA entirely from the
10+
# server-populated workflow_run event payload (which a fork cannot forge), so a
11+
# fork's copy of this file cannot influence what gets reviewed or where comments
12+
# are posted.
13+
#
14+
# This is a thin caller -- the (now no-op) collect job lives in the reusable
15+
# workflow in aws-deadline/.github.
16+
name: Claude PR Review (collect)
17+
18+
on:
19+
pull_request:
20+
types: [opened, synchronize]
21+
22+
# Cancel an in-flight collect run when the PR is updated again.
23+
concurrency:
24+
group: claude-pr-review-collect-${{ github.event.pull_request.number }}
25+
cancel-in-progress: true
26+
27+
# No permissions needed: this stage only exists to fire the workflow_run event.
28+
permissions: {}
29+
30+
jobs:
31+
collect:
32+
uses: aws-deadline/.github/.github/workflows/reusable_claude_pr_review_collect.yml@mainline

‎.github/workflows/codeql.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
security-events: write
3030
steps:
3131
- name: Checkout repository
32-
uses: actions/checkout@v6
32+
uses: actions/checkout@v7
3333

3434
- name: Initialize CodeQL
3535
uses: github/codeql-action/init@v4

‎.github/workflows/rust_quality.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ jobs:
5151

5252
steps:
5353
- name: Checkout openjd-model-for-python
54-
uses: actions/checkout@v4
54+
uses: actions/checkout@v7
5555
with:
5656
ref: ${{ inputs.branch || inputs.tag || github.ref }}
5757

@@ -71,7 +71,7 @@ jobs:
7171

7272
- name: Cache Cargo registry and build artifacts
7373
id: cache
74-
uses: actions/cache@v4
74+
uses: actions/cache@v6
7575
with:
7676
path: |
7777
~/.cargo/registry/index
@@ -118,7 +118,7 @@ jobs:
118118
contents: read
119119
steps:
120120
- name: Checkout openjd-model-for-python
121-
uses: actions/checkout@v4
121+
uses: actions/checkout@v7
122122
with:
123123
ref: ${{ inputs.branch || inputs.tag || github.ref }}
124124

@@ -133,7 +133,7 @@ jobs:
133133
# Restore-only: rust_quality(ubuntu) owns the cache write. Saving
134134
# from here too would race with that job.
135135
- name: Restore Cargo cache (read-only)
136-
uses: actions/cache/restore@v4
136+
uses: actions/cache/restore@v6
137137
with:
138138
path: |
139139
~/.cargo/registry/index
@@ -159,7 +159,7 @@ jobs:
159159
contents: read
160160
steps:
161161
- name: Checkout openjd-model-for-python
162-
uses: actions/checkout@v4
162+
uses: actions/checkout@v7
163163
with:
164164
ref: ${{ inputs.branch || inputs.tag || github.ref }}
165165

@@ -186,7 +186,7 @@ jobs:
186186
contents: read
187187
steps:
188188
- name: Checkout openjd-model-for-python
189-
uses: actions/checkout@v4
189+
uses: actions/checkout@v7
190190
with:
191191
ref: ${{ inputs.branch || inputs.tag || github.ref }}
192192

‎CHANGELOG.md‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,14 @@
1+
## 0.11.0 (2026-07-09)
2+
3+
4+
### Features
5+
* bump openjd crates for EXPR and WRAP_ACTIONS extension support (#306) ([`9995c45`](https://github.com/OpenJobDescription/openjd-model-for-python/commit/9995c453c693e292b9cc8e61e7a8b3cc3fce1d7f))
6+
* Implement WRAP_ACTIONS with EXPR binding to RS (#285) ([`8eae8ae`](https://github.com/OpenJobDescription/openjd-model-for-python/commit/8eae8ae133fe0fd80d616ee698770c137c824cbc))
7+
8+
### Bug Fixes
9+
* resolve recommendations #1-#4 from model-bindings quality report ([`8f1f9f1`](https://github.com/OpenJobDescription/openjd-model-for-python/commit/8f1f9f1c3f5d9d148d4c7398014dd142835e784e))
10+
11+
112
## 0.10.1 (2026-06-25)
213

314
_There are no new changes introduced in this release, it is identical to 0.10.0. This release was made to publish all release artifacts on PyPI and the GitHub releases page that were missed in the 0.10.0 release due to a new build and release process._

‎Cargo.lock‎

Lines changed: 10 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎THIRD-PARTY-LICENSES.txt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2522,13 +2522,13 @@ limitations under the License.
25222522
** arraydeque; version 0.5.1 -- https://crates.io/crates/arraydeque
25232523
** get-size-derive2; version 0.7.4 -- https://crates.io/crates/get-size-derive2
25242524
** get-size2; version 0.7.4 -- https://crates.io/crates/get-size2
2525-
** granit-parser; version 0.0.2 -- https://crates.io/crates/granit-parser
2525+
** granit-parser; version 0.0.3 -- https://crates.io/crates/granit-parser
25262526
** itoa; version 1.0.18 -- https://crates.io/crates/itoa
25272527
** libc; version 0.2.186 -- https://crates.io/crates/libc
25282528
** manyhow-macros; version 0.11.4 -- https://crates.io/crates/manyhow-macros
25292529
** openjd-expr; version 0.1.2 -- https://crates.io/crates/openjd-expr
2530-
** openjd-model; version 0.2.1 -- https://crates.io/crates/openjd-model
2531-
** openjd-sessions; version 0.2.3 -- https://crates.io/crates/openjd-sessions
2530+
** openjd-model; version 0.3.0 -- https://crates.io/crates/openjd-model
2531+
** openjd-sessions; version 0.3.1 -- https://crates.io/crates/openjd-sessions
25322532
** pin-project-lite; version 0.2.17 -- https://crates.io/crates/pin-project-lite
25332533
** portable-atomic; version 1.13.1 -- https://crates.io/crates/portable-atomic
25342534
** proc-macro2; version 1.0.106 -- https://crates.io/crates/proc-macro2
@@ -2542,7 +2542,7 @@ limitations under the License.
25422542
** rustc-hash; version 2.1.2 -- https://crates.io/crates/rustc-hash
25432543
** rustversion; version 1.0.22 -- https://crates.io/crates/rustversion
25442544
** ryu; version 1.0.23 -- https://crates.io/crates/ryu
2545-
** serde-saphyr; version 0.0.26 -- https://crates.io/crates/serde-saphyr
2545+
** serde-saphyr; version 0.0.27 -- https://crates.io/crates/serde-saphyr
25462546
** serde; version 1.0.228 -- https://crates.io/crates/serde
25472547
** serde_core; version 1.0.228 -- https://crates.io/crates/serde_core
25482548
** serde_derive; version 1.0.228 -- https://crates.io/crates/serde_derive

‎requirements-development.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
hatch == 1.16.*
1+
hatch == 1.17.*
22
hatch-vcs == 0.5.*

‎requirements-release.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
python-semantic-release == 10.5.*
1+
python-semantic-release == 10.6.*

0 commit comments

Comments
 (0)