Skip to content

Commit 85a44d8

Browse files
lriggslriggs
committed
Merge remote-tracking branch 'upstream/main' into fixTemplate
2 parents 7d5e3ce + d13f0e0 commit 85a44d8

File tree

18 files changed

+399
-192
lines changed

18 files changed

+399
-192
lines changed

‎.asf.yaml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,6 @@ github:
3333
protected_branches:
3434
main:
3535
required_linear_history: true
36-
collaborators: # Note: the number of collaborators is limited to 10
37-
- jbonofre
3836
notifications:
3937
commits: commits@arrow.apache.org
4038
issues_status: issues@arrow.apache.org

‎.github/CODEOWNERS‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -23,34 +23,34 @@
2323
# documentation about the syntax: https://docs.github.com/en/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/about-code-owners
2424

2525
# modules
26-
/adapter/ @lidavidm @laurentgo @wgtmac
27-
/algorithm/ @lidavidm @laurentgo @wgtmac
28-
/arrow-format/ @lidavidm @laurentgo @wgtmac
29-
/c/ @lidavidm @laurentgo @wgtmac
30-
/compression/ @lidavidm @laurentgo @wgtmac
31-
/dataset/ @lidavidm @laurentgo @wgtmac
32-
/flight/ @lidavidm @laurentgo @wgtmac
33-
/format/ @lidavidm @laurentgo @wgtmac
34-
/gandiva/ @lidavidm @laurentgo @wgtmac
35-
/memory/ @lidavidm @laurentgo @wgtmac
36-
/performance/ @lidavidm @laurentgo @wgtmac
37-
/tools/ @lidavidm @laurentgo @wgtmac
38-
/vector/ @lidavidm @laurentgo @wgtmac
39-
CMakeLists.txt @lidavidm @laurentgo @wgtmac
26+
/adapter/ @lidavidm @laurentgo @wgtmac @jbonofre
27+
/algorithm/ @lidavidm @laurentgo @wgtmac @jbonofre
28+
/arrow-format/ @lidavidm @laurentgo @wgtmac @jbonofre
29+
/c/ @lidavidm @laurentgo @wgtmac @jbonofre
30+
/compression/ @lidavidm @laurentgo @wgtmac @jbonofre
31+
/dataset/ @lidavidm @laurentgo @wgtmac @jbonofre
32+
/flight/ @lidavidm @laurentgo @wgtmac @jbonofre
33+
/format/ @lidavidm @laurentgo @wgtmac @jbonofre
34+
/gandiva/ @lidavidm @laurentgo @wgtmac @jbonofre
35+
/memory/ @lidavidm @laurentgo @wgtmac @jbonofre
36+
/performance/ @lidavidm @laurentgo @wgtmac @jbonofre
37+
/tools/ @lidavidm @laurentgo @wgtmac @jbonofre
38+
/vector/ @lidavidm @laurentgo @wgtmac @jbonofre
39+
CMakeLists.txt @lidavidm @laurentgo @wgtmac @jbonofre
4040

4141
# release scripts
42-
/ci/ @lidavidm @laurentgo @wgtmac @kou
43-
/dev/ @lidavidm @laurentgo @wgtmac @kou
42+
/ci/ @lidavidm @laurentgo @wgtmac @kou @jbonofre
43+
/dev/ @lidavidm @laurentgo @wgtmac @kou @jbonofre
4444

4545
# PR CI and repository files
46-
/.github/ @lidavidm @laurentgo @wgtmac @kou
47-
/.asf.yaml @lidavidm @laurentgo @wgtmac @kou
48-
/.env @lidavidm @laurentgo @wgtmac
49-
/.pre-commit-config.yaml @lidavidm @laurentgo @wgtmac
50-
/Brewfile @lidavidm @laurentgo @wgtmac
51-
/docker-compose.yaml @lidavidm @laurentgo @wgtmac
46+
/.github/ @lidavidm @laurentgo @wgtmac @kou @jbonofre
47+
/.asf.yaml @lidavidm @laurentgo @wgtmac @kou @jbonofre
48+
/.env @lidavidm @laurentgo @wgtmac @jbonofre
49+
/.pre-commit-config.yaml @lidavidm @laurentgo @wgtmac @jbonofre
50+
/Brewfile @lidavidm @laurentgo @wgtmac @jbonofre
51+
/docker-compose.yaml @lidavidm @laurentgo @wgtmac @jbonofre
5252

5353
# Java specific
54-
/.mvn/ @lidavidm @laurentgo @wgtmac
55-
/bom/ @lidavidm @laurentgo @wgtmac
56-
pom.xml @lidavidm @laurentgo @wgtmac
54+
/.mvn/ @lidavidm @laurentgo @wgtmac @jbonofre
55+
/bom/ @lidavidm @laurentgo @wgtmac @jbonofre
56+
pom.xml @lidavidm @laurentgo @wgtmac @jbonofre

‎.github/workflows/dev_pr.yml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,3 +75,10 @@ jobs:
7575
script: |
7676
const scripts = require(`${process.env.GITHUB_WORKSPACE}/.github/workflows/dev_pr.js`);
7777
await scripts.check_linked_issue({core, github, context, issue: ${{ steps.title-format.outputs.result }}});
78+
79+
- name: Assign milestone
80+
if: '! github.event.pull_request.draft'
81+
env:
82+
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
83+
run: |
84+
./.github/workflows/dev_pr_milestone.sh "${GITHUB_REPOSITORY}" ${{ github.event.number }}

‎.github/workflows/dev_pr_milestone.sh‎

Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
#!/usr/bin/env bash
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+
# Assign a milestone to the given PR based on the open milestones and known
20+
# releases.
21+
22+
set -euo pipefail
23+
24+
main() {
25+
local -r repo="${1}"
26+
local -r pr_number="${2}"
27+
echo "On ${repo} pull ${pr_number}"
28+
29+
local -r existing_milestone=$(gh pr view "${pr_number}" \
30+
--json milestone \
31+
-t '{{if .milestone}}{{.milestone.title}}{{end}}')
32+
33+
if [[ -n "${existing_milestone}" ]]; then
34+
echo "PR has milestone: ${existing_milestone}"
35+
local -r milestone="${existing_milestone}"
36+
else
37+
local -r milestone=$(
38+
gh api "/repos/${repo}/milestones" |
39+
jq --raw-output '.[] | .title' |
40+
grep -E '^[0-9]+\.[0-9]+\.[0-9]+$'
41+
head -n1
42+
)
43+
44+
echo "Assigning milestone: ${milestone}"
45+
gh pr edit "${pr_number}" -m "${milestone}"
46+
fi
47+
48+
local -r repo_owner=$(echo "${repo}" | cut -d'/' -f1)
49+
local -r repo_name=$(echo "${repo}" | cut -d'/' -f2)
50+
local -r graphql_query="{
51+
repository(owner: \"${repo_owner}\", name: \"${repo_name}\") {
52+
pullRequest(number: ${pr_number}) {
53+
closingIssuesReferences(first: 5) {
54+
edges {
55+
node {
56+
number
57+
}
58+
}
59+
}
60+
}
61+
}
62+
}"
63+
local -r linked_issues=$(gh api graphql -f query="${graphql_query}" | jq -r '.data.repository.pullRequest.closingIssuesReferences.edges | .[].node.number')
64+
for issue in ${linked_issues}; do
65+
echo "Linked issue: ${issue}"
66+
gh issue edit "${issue}" --milestone "${milestone}"
67+
done
68+
}
69+
70+
main "$@"

‎.pre-commit-config.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ repos:
2525
hooks:
2626
- id: trailing-whitespace
2727
- id: end-of-file-fixer
28+
- id: check-shebang-scripts-are-executable
2829
- id: check-yaml
2930
- id: check-added-large-files
3031
- id: file-contents-sorter

‎adapter/orc/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ under the License.
6161
<dependency>
6262
<groupId>org.apache.orc</groupId>
6363
<artifactId>orc-core</artifactId>
64-
<version>2.1.0</version>
64+
<version>2.1.1</version>
6565
<scope>test</scope>
6666
<exclusions>
6767
<exclusion>

‎dataset/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ under the License.
130130
<dependency>
131131
<groupId>org.apache.orc</groupId>
132132
<artifactId>orc-core</artifactId>
133-
<version>2.1.0</version>
133+
<version>2.1.1</version>
134134
<scope>test</scope>
135135
<exclusions>
136136
<exclusion>

0 commit comments

Comments
 (0)