Skip to content

Commit 67d0fed

Browse files
Merge main to resolve Windows ARM64 workflow conflicts
Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
2 parents 85105ce + 042165a commit 67d0fed

152 files changed

Lines changed: 9207 additions & 1931 deletions

File tree

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: 60 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,16 +33,69 @@ 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-
# strict means "Require branches to be up to date before merging".
40-
strict: true
41-
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
4251
required_pull_request_reviews:
4352
required_approving_review_count: 1
53+
- name: Merge Queue
54+
target: branch
55+
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
66+
conditions:
67+
ref_name:
68+
include:
69+
- "~DEFAULT_BRANCH"
70+
exclude: []
71+
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
4482

45-
required_linear_history: true
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
90+
- type: merge_queue
91+
parameters:
92+
check_response_timeout_minutes: 180
93+
grouping_strategy: ALLGREEN
94+
max_entries_to_build: 2
95+
max_entries_to_merge: 1
96+
merge_method: SQUASH
97+
min_entries_to_merge: 1
98+
min_entries_to_merge_wait_minutes: 0
4699
pull_requests:
47100
# allow pull requests to merge automatically once all requirements are met
48101
allow_auto_merge: true

‎.github/ISSUE_TEMPLATE/iceberg_bug_report.yml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,9 @@ body:
2828
description: What Apache Iceberg version are you using?
2929
multiple: false
3030
options:
31-
- "0.11.0 (latest release)"
31+
- "0.12.0 (latest release)"
32+
- "0.11.1"
33+
- "0.11.0"
3234
- "0.10.0"
3335
- "0.9.1"
3436
- "0.9.0"

‎.github/dependabot.yml‎

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ updates:
2222
- package-ecosystem: "uv"
2323
directory: "/"
2424
schedule:
25-
interval: "weekly"
25+
interval: "monthly"
2626
open-pull-requests-limit: 50
2727
ignore:
2828
- dependency-name: "datafusion"
@@ -31,7 +31,7 @@ updates:
3131
- package-ecosystem: "github-actions"
3232
directory: "/"
3333
schedule:
34-
interval: "weekly"
34+
interval: "monthly"
3535
cooldown:
3636
default-days: 7
3737
groups:
@@ -41,3 +41,16 @@ updates:
4141
codeql-action:
4242
patterns:
4343
- "github/codeql-action*"
44+
# dev/spark/Dockerfile is not listed: its base image tag comes from an ARG, which Dependabot cannot resolve
45+
- package-ecosystem: "docker"
46+
directory: "/dev/hive"
47+
schedule:
48+
interval: "monthly"
49+
cooldown:
50+
default-days: 7
51+
- package-ecosystem: "docker-compose"
52+
directory: "/dev"
53+
schedule:
54+
interval: "monthly"
55+
cooldown:
56+
default-days: 7

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,16 +25,18 @@ name: "ASF Allowlist Check"
2525

2626
on:
2727
pull_request:
28-
push:
29-
branches:
30-
- main
28+
merge_group:
3129

3230
permissions:
3331
contents: read
3432

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

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

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,24 +20,20 @@
2020
name: Check Markdown links
2121

2222
on:
23-
push:
24-
paths:
25-
- '.github/workflows/check-md-link.yml'
26-
- 'mkdocs/**'
27-
branches:
28-
- 'main'
2923
pull_request:
30-
paths:
31-
- '.github/workflows/check-md-link.yml'
32-
- 'mkdocs/**'
24+
merge_group:
3325
workflow_dispatch:
3426

3527
permissions:
3628
contents: read
3729

30+
concurrency:
31+
group: ${{ github.workflow }}-${{ github.ref }}
32+
cancel-in-progress: true
33+
3834
jobs:
3935
markdown-link-check:
40-
runs-on: ubuntu-latest
36+
runs-on: ubuntu-24.04
4137
steps:
4238
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
4339
with:

‎.github/workflows/codeql.yml‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,17 @@ on:
2424
branches: [ "main" ]
2525
pull_request:
2626
branches: [ "main" ]
27+
merge_group:
2728
schedule:
2829
- cron: '16 4 * * 1'
2930

3031
permissions:
3132
contents: read
3233

34+
concurrency:
35+
group: ${{ github.workflow }}-${{ github.ref }}
36+
cancel-in-progress: ${{ github.event_name == 'pull_request' }}
37+
3338
jobs:
3439
analyze:
3540
name: Analyze Actions
@@ -46,11 +51,11 @@ jobs:
4651
persist-credentials: false
4752

4853
- name: Initialize CodeQL
49-
uses: github/codeql-action/init@ff2f1c621b7f889edc0d3c761ac2e6a3f8cdb0dd # v4.37.7
54+
uses: github/codeql-action/init@2892aa5e19bbd11bc0cff5427e3b750a04d9e3c2 # v4.38.2
5055
with:
5156
languages: actions
5257

5358
- name: Perform CodeQL Analysis
54-
uses: github/codeql-action/analyze@ff2f1c621b7f889edc0d3c761ac2e6a3f8cdb0dd # v4.37.7
59+
uses: github/codeql-action/analyze@2892aa5e19bbd11bc0cff5427e3b750a04d9e3c2 # v4.38.2
5560
with:
5661
category: "/language:actions"

‎.github/workflows/license_check.yml‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,26 @@
1818
#
1919

2020
name: "Run License Check"
21-
on: pull_request
21+
on:
22+
pull_request:
23+
merge_group:
2224

2325
permissions:
2426
contents: read
2527

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

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

Lines changed: 3 additions & 3 deletions
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:
@@ -44,7 +44,7 @@ jobs:
4444
python-version: 3.12
4545

4646
- name: Install UV
47-
uses: astral-sh/setup-uv@fac544c07dec837d0ccb6301d7b5580bf5edae39 # v8.2.0
47+
uses: astral-sh/setup-uv@c18668ad3cf93ea998bef934396af7bb5c839dc7 # v10.2.0
4848

4949
- name: Set version
5050
id: set-version
@@ -69,7 +69,7 @@ jobs:
6969
if: github.repository == 'apache/iceberg-python' # Only run for apache repo
7070
needs:
7171
- nightly-build
72-
runs-on: ubuntu-latest
72+
runs-on: ubuntu-24.04
7373
environment:
7474
name: testpypi
7575
url: https://test.pypi.org/p/pyiceberg

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
strategy:
3737
max-parallel: 15
3838
matrix:
39-
os: [ ubuntu-latest, ubuntu-24.04-arm, windows-latest, macos-15-intel, macos-latest ]
39+
os: [ ubuntu-24.04, ubuntu-24.04-arm, windows-latest, macos-15-intel, macos-latest ]
4040
include:
4141
- os: windows-11-arm
4242
windows_archs: "ARM64"
@@ -59,7 +59,7 @@ jobs:
5959
3.14
6060
6161
- name: Install UV
62-
uses: astral-sh/setup-uv@fac544c07dec837d0ccb6301d7b5580bf5edae39 # v8.2.0
62+
uses: astral-sh/setup-uv@c18668ad3cf93ea998bef934396af7bb5c839dc7 # v10.2.0
6363

6464
- name: Set version with RC
6565
shell: bash
@@ -71,10 +71,10 @@ jobs:
7171
# the repository, otherwise the tests will fail
7272
- name: Compile source distribution
7373
run: uv build --sdist
74-
if: matrix.os == 'ubuntu-latest'
74+
if: matrix.os == 'ubuntu-24.04'
7575

7676
- name: Build wheels
77-
uses: pypa/cibuildwheel@1828c10ab37f080699c7b81cea34097c684a7074 # v4.2.0
77+
uses: pypa/cibuildwheel@e090b81e30c4d855ea63bf4b6e59204c09a101ae # v4.2.1
7878
with:
7979
output-dir: wheelhouse
8080
config-file: "pyproject.toml"
@@ -95,7 +95,7 @@ jobs:
9595

9696

9797
- name: Add source distribution
98-
if: matrix.os == 'ubuntu-latest'
98+
if: matrix.os == 'ubuntu-24.04'
9999
run: ls -lah dist/* && cp dist/* wheelhouse/
100100

101101
- uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
@@ -104,7 +104,7 @@ jobs:
104104
path: ./wheelhouse/*
105105

106106
pypi-merge-artifacts:
107-
runs-on: ubuntu-latest
107+
runs-on: ubuntu-slim
108108
needs:
109109
- pypi-build-artifacts
110110
steps:

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

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,18 +20,16 @@
2020
name: "Python CI Docs"
2121

2222
on:
23-
push:
24-
branches:
25-
- 'main'
2623
pull_request:
24+
merge_group:
2725

2826
permissions:
2927
contents: read
3028

3129

3230
concurrency:
3331
group: ${{ github.workflow }}-${{ github.ref }}
34-
cancel-in-progress: ${{ github.event_name == 'pull_request' }}
32+
cancel-in-progress: true
3533

3634
jobs:
3735
docs:
@@ -45,8 +43,6 @@ jobs:
4543
with:
4644
python-version: 3.12
4745
- name: Install UV
48-
uses: astral-sh/setup-uv@fac544c07dec837d0ccb6301d7b5580bf5edae39 # v8.2.0
46+
uses: astral-sh/setup-uv@c18668ad3cf93ea998bef934396af7bb5c839dc7 # v10.2.0
4947
- name: Build docs
5048
run: make docs-build
51-
- name: Run linters
52-
run: make lint

0 commit comments

Comments
 (0)