Skip to content

Commit 91d123a

Browse files
committed
Merge remote-tracking branch 'origin/main' into fix/avro-named-type-references
# Conflicts: # tests/avro/test_file.py
2 parents 4f95b2e + 2ecd87b commit 91d123a

58 files changed

Lines changed: 2331 additions & 521 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.asf.yaml‎

Lines changed: 45 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -33,43 +33,65 @@ github:
3333
squash: true
3434
squash_commit_message: PR_TITLE_AND_COMMIT_DETAILS
3535
rebase: true
36-
protected_branches:
37-
main:
38-
required_status_checks:
39-
contexts:
40-
# Repository policy and security checks.
41-
- Analyze Actions
42-
- Run zizmor 🌈
43-
- asf-allowlist-check
44-
- rat
45-
46-
# Documentation checks.
47-
- docs
48-
- markdown-link-check
49-
50-
# Python workflow gates.
51-
- python-ci-required
52-
- python-integration-required
53-
36+
# Disabled: GitHub blocks ruleset bypass while classic protection exists.
37+
# The "Default Branch Protection" ruleset replaces it.
38+
protected_branches: ~
39+
rulesets:
40+
- name: "Default Branch Protection"
41+
type: branch
42+
branches:
43+
includes:
44+
- "~DEFAULT_BRANCH"
45+
excludes: []
46+
bypass_teams:
47+
- root
48+
restrict_deletion: true
49+
restrict_force_push: true
50+
required_linear_history: true
5451
required_pull_request_reviews:
5552
required_approving_review_count: 1
56-
57-
required_linear_history: true
58-
rulesets:
5953
- name: Merge Queue
6054
target: branch
6155
enforcement: active
56+
bypass_actors:
57+
# apache/root (ASF Infra).
58+
- actor_id: 118420
59+
actor_type: Team
60+
bypass_mode: always
61+
# apache/iceberg-public. Iceberg committers can opt into this team via
62+
# https://gitbox.apache.org/boxer/.
63+
- actor_id: 20107235
64+
actor_type: Team
65+
bypass_mode: pull_request
6266
conditions:
6367
ref_name:
6468
include:
6569
- "~DEFAULT_BRANCH"
6670
exclude: []
6771
rules:
72+
- type: required_status_checks
73+
parameters:
74+
# Merge Queue already tests each entry against the latest main
75+
strict_required_status_checks_policy: false
76+
required_status_checks:
77+
# Repository policy and security checks.
78+
- context: Analyze Actions
79+
- context: Run zizmor 🌈
80+
- context: asf-allowlist-check
81+
- context: rat
82+
83+
# Documentation checks.
84+
- context: docs
85+
- context: markdown-link-check
86+
87+
# Python workflow gates.
88+
- context: python-ci-required
89+
- context: python-integration-required
6890
- type: merge_queue
6991
parameters:
70-
check_response_timeout_minutes: 90
92+
check_response_timeout_minutes: 180
7193
grouping_strategy: ALLGREEN
72-
max_entries_to_build: 1
94+
max_entries_to_build: 2
7395
max_entries_to_merge: 1
7496
merge_method: SQUASH
7597
min_entries_to_merge: 1

‎.github/workflows/asf-allowlist-check.yml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,13 @@ on:
3030
permissions:
3131
contents: read
3232

33+
concurrency:
34+
group: ${{ github.workflow }}-${{ github.ref }}
35+
cancel-in-progress: ${{ github.event_name == 'pull_request' }}
36+
3337
jobs:
3438
asf-allowlist-check:
35-
runs-on: ubuntu-24.04
39+
runs-on: ubuntu-slim
3640
steps:
3741
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
3842
with:

‎.github/workflows/check-md-link.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,10 @@ on:
2727
permissions:
2828
contents: read
2929

30+
concurrency:
31+
group: ${{ github.workflow }}-${{ github.ref }}
32+
cancel-in-progress: true
33+
3034
jobs:
3135
markdown-link-check:
3236
runs-on: ubuntu-latest

‎.github/workflows/codeql.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,10 @@ on:
3131
permissions:
3232
contents: read
3333

34+
concurrency:
35+
group: ${{ github.workflow }}-${{ github.ref }}
36+
cancel-in-progress: ${{ github.event_name == 'pull_request' }}
37+
3438
jobs:
3539
analyze:
3640
name: Analyze Actions

‎.github/workflows/license_check.yml‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,19 @@ on:
2525
permissions:
2626
contents: read
2727

28+
concurrency:
29+
group: ${{ github.workflow }}-${{ github.ref }}
30+
cancel-in-progress: ${{ github.event_name == 'pull_request' }}
31+
2832
jobs:
2933
rat:
30-
runs-on: ubuntu-latest
34+
runs-on: ubuntu-slim
3135
steps:
3236
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
3337
with:
3438
persist-credentials: false
39+
- uses: actions/setup-java@de7274f081f381c8f8158605e0321c36c376e2e6 # v6.0.1
40+
with:
41+
distribution: temurin
42+
java-version: 21
3543
- run: dev/check-license

‎.github/workflows/nightly-pypi-build.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ permissions:
3030
jobs:
3131
set-version:
3232
if: github.repository == 'apache/iceberg-python' || github.event_name == 'workflow_dispatch' # Run on schedule for apache repo, or on manual dispatch from any repo
33-
runs-on: ubuntu-latest
33+
runs-on: ubuntu-slim
3434
outputs:
3535
VERSION: ${{ steps.set-version.outputs.VERSION }}
3636
steps:

‎.github/workflows/pypi-build-artifacts.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ jobs:
9595
path: ./wheelhouse/*
9696

9797
pypi-merge-artifacts:
98-
runs-on: ubuntu-latest
98+
runs-on: ubuntu-slim
9999
needs:
100100
- pypi-build-artifacts
101101
steps:

‎.github/workflows/python-ci-docs.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ permissions:
2929

3030
concurrency:
3131
group: ${{ github.workflow }}-${{ github.ref }}
32-
cancel-in-progress: ${{ github.event_name == 'pull_request' }}
32+
cancel-in-progress: true
3333

3434
jobs:
3535
docs:

‎.github/workflows/python-ci.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ permissions:
2828

2929
concurrency:
3030
group: ${{ github.workflow }}-${{ github.ref }}
31-
cancel-in-progress: ${{ github.event_name == 'pull_request' }}
31+
cancel-in-progress: true
3232

3333
jobs:
3434
lint-and-unit-test:
@@ -91,7 +91,7 @@ jobs:
9191
run: uv run python -m pytest tests/ -m unit --ignore=tests/integration -v -x
9292

9393
cibw-dev-env-smoke-test:
94-
runs-on: ubuntu-latest
94+
runs-on: ubuntu-slim
9595
steps:
9696
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
9797
with:
@@ -118,7 +118,7 @@ jobs:
118118
python-ci-required:
119119
if: ${{ always() }}
120120
needs: [lint-and-unit-test, windows-unit-test, cibw-dev-env-smoke-test]
121-
runs-on: ubuntu-latest
121+
runs-on: ubuntu-slim
122122
steps:
123123
- name: Verify Python CI jobs succeeded
124124
env:

‎.github/workflows/python-integration.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ permissions:
2828

2929
concurrency:
3030
group: ${{ github.workflow }}-${{ github.ref }}
31-
cancel-in-progress: ${{ github.event_name == 'pull_request' }}
31+
cancel-in-progress: true
3232

3333
jobs:
3434
integration-test:
@@ -152,7 +152,7 @@ jobs:
152152
include-hidden-files: true
153153

154154
integration-coverage-report:
155-
runs-on: ubuntu-latest
155+
runs-on: ubuntu-slim
156156
needs: [integration-test, integration-test-s3, integration-test-adls, integration-test-gcs]
157157
steps:
158158
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
@@ -178,7 +178,7 @@ jobs:
178178
python-integration-required:
179179
if: ${{ always() }}
180180
needs: [integration-test, integration-test-s3, integration-test-adls, integration-test-gcs, integration-coverage-report]
181-
runs-on: ubuntu-latest
181+
runs-on: ubuntu-slim
182182
steps:
183183
- name: Verify Python integration jobs succeeded
184184
env:

0 commit comments

Comments
 (0)