Skip to content

Commit d0fd31b

Browse files
Merge remote-tracking branch 'upstream/master' into SPARK-58821-sequence-length-internal-error
2 parents 56c8a92 + f37971c commit d0fd31b

1,748 files changed

Lines changed: 73907 additions & 11479 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: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@ github:
3232
enabled_merge_buttons:
3333
merge: false
3434
squash: true
35-
rebase: true
35+
squash_commit_message: PR_TITLE_AND_DESC
36+
rebase: false
3637
ghp_branch: master
3738
ghp_path: /docs
3839

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
#
2+
# Licensed to the Apache Software Foundation (ASF) under one
3+
# or more contributor license agreements. See the NOTICE file
4+
# distributed with this work for additional information
5+
# regarding copyright ownership. The ASF licenses this file
6+
# to you under the Apache License, Version 2.0 (the
7+
# "License"); you may not use this file except in compliance
8+
# with the License. You may obtain a copy of the License at
9+
#
10+
# http://www.apache.org/licenses/LICENSE-2.0
11+
#
12+
# Unless required by applicable law or agreed to in writing,
13+
# software distributed under the License is distributed on an
14+
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15+
# KIND, either express or implied. See the License for the
16+
# specific language governing permissions and limitations
17+
# under the License.
18+
#
19+
20+
name: 'Checkout and Sync'
21+
description: >-
22+
Check out apache/spark at a pinned ref and, on forks, squash-merge the fork
23+
branch on top so the build tests the combined result. Callers must add a
24+
bare 'actions/checkout' step before invoking this action so that the latest
25+
action definition is present in the workspace.
26+
inputs:
27+
ref:
28+
description: 'Git ref to check out from apache/spark'
29+
required: true
30+
set-safe-directory:
31+
description: 'Add GITHUB_WORKSPACE to git safe.directory (needed inside containers)'
32+
required: false
33+
default: 'false'
34+
outputs:
35+
head_sha:
36+
description: 'The apache/spark HEAD SHA checked out (before the fork merge)'
37+
value: ${{ steps.resolve-sha.outputs.head_sha }}
38+
runs:
39+
using: 'composite'
40+
steps:
41+
- name: Checkout Spark repository
42+
uses: actions/checkout@v6
43+
with:
44+
fetch-depth: 0
45+
repository: apache/spark
46+
ref: ${{ inputs.ref }}
47+
- name: Add GITHUB_WORKSPACE to git trust safe.directory
48+
if: inputs.set-safe-directory == 'true'
49+
shell: bash
50+
run: git config --global --add safe.directory ${GITHUB_WORKSPACE}
51+
- name: Resolve apache/spark HEAD SHA
52+
id: resolve-sha
53+
shell: bash
54+
run: echo "head_sha=$(git rev-parse HEAD)" >> $GITHUB_OUTPUT
55+
- name: Sync the current branch with the latest in Apache Spark
56+
if: github.repository != 'apache/spark'
57+
shell: bash
58+
run: |
59+
echo "APACHE_SPARK_REF=$(git rev-parse HEAD)" >> $GITHUB_ENV
60+
git fetch https://github.com/$GITHUB_REPOSITORY.git ${GITHUB_REF#refs/heads/}
61+
git \
62+
-c user.name='Apache Spark Test Account' \
63+
-c user.email='[email protected]' \
64+
merge --no-commit --progress --squash FETCH_HEAD
65+
git \
66+
-c user.name='Apache Spark Test Account' \
67+
-c user.email='[email protected]' \
68+
commit -m "Merged commit" --allow-empty

0 commit comments

Comments
 (0)