From 2f8bf1b6f743c0a92271f868258f4f342829e020 Mon Sep 17 00:00:00 2001 From: Andy Grove Date: Sun, 18 Apr 2021 12:30:42 -0600 Subject: [PATCH 1/5] fix indent --- .asf.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.asf.yaml b/.asf.yaml index addd7dd5baaa..646bdac5f912 100644 --- a/.asf.yaml +++ b/.asf.yaml @@ -22,7 +22,7 @@ notifications: jira_options: link label worklog github: description: "Official Rust implementation of Apache Arrow" - homepage: https://arrow.apache.org/ + homepage: https://arrow.apache.org/ enabled_merge_buttons: squash: true merge: false From 87df4523fbbf0494e8236ec9dee6f62d85c9f8de Mon Sep 17 00:00:00 2001 From: Jorge Leitao Date: Mon, 19 Apr 2021 08:01:42 +0200 Subject: [PATCH 2/5] Made CI run on any change. (#5) --- .github/workflows/rust.yml | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index d19dd9389ff3..53f9ac20c3b8 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -18,16 +18,9 @@ name: Rust on: + # always trigger push: - paths: - - '.github/workflows/rust.yml' - - 'rust/**' - - 'format/Flight.proto' pull_request: - paths: - - '.github/workflows/rust.yml' - - 'rust/**' - - 'format/Flight.proto' jobs: From 9d224858710657ba392176e0bf4b3fbab4a9a562 Mon Sep 17 00:00:00 2001 From: Jorge Leitao Date: Mon, 19 Apr 2021 08:02:59 +0200 Subject: [PATCH 3/5] Removed bot comment about title and JIRA. (#4) --- .github/workflows/dev_pr.yml | 24 --------- .github/workflows/dev_pr/link.js | 69 ------------------------- .github/workflows/dev_pr/title_check.js | 56 -------------------- .github/workflows/dev_pr/title_check.md | 37 ------------- 4 files changed, 186 deletions(-) delete mode 100644 .github/workflows/dev_pr/link.js delete mode 100644 .github/workflows/dev_pr/title_check.js delete mode 100644 .github/workflows/dev_pr/title_check.md diff --git a/.github/workflows/dev_pr.yml b/.github/workflows/dev_pr.yml index 7b92b8970517..89bc776cad47 100644 --- a/.github/workflows/dev_pr.yml +++ b/.github/workflows/dev_pr.yml @@ -35,30 +35,6 @@ jobs: steps: - uses: actions/checkout@v2 - - name: Comment JIRA link - if: | - github.event_name == 'pull_request_target' && - (github.event.action == 'opened' || - github.event.action == 'edited') - uses: actions/github-script@v3 - with: - github-token: ${{ secrets.GITHUB_TOKEN }} - script: | - const script = require(`${process.env.GITHUB_WORKSPACE}/.github/workflows/dev_pr/link.js`); - script({github, context}); - - - name: Check title - if: | - github.event_name == 'pull_request_target' && - (github.event.action == 'opened' || - github.event.action == 'edited') - uses: actions/github-script@v3 - with: - github-token: ${{ secrets.GITHUB_TOKEN }} - script: | - const script = require(`${process.env.GITHUB_WORKSPACE}/.github/workflows/dev_pr/title_check.js`); - script({github, context}); - - name: Assign GitHub labels if: | github.event_name == 'pull_request_target' && diff --git a/.github/workflows/dev_pr/link.js b/.github/workflows/dev_pr/link.js deleted file mode 100644 index 550a9cd396d7..000000000000 --- a/.github/workflows/dev_pr/link.js +++ /dev/null @@ -1,69 +0,0 @@ -// Licensed to the Apache Software Foundation (ASF) under one -// or more contributor license agreements. See the NOTICE file -// distributed with this work for additional information -// regarding copyright ownership. The ASF licenses this file -// to you under the Apache License, Version 2.0 (the -// "License"); you may not use this file except in compliance -// with the License. You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, -// software distributed under the License is distributed on an -// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the License for the -// specific language governing permissions and limitations -// under the License. - -function detectJIRAID(title) { - if (!title) { - return null; - } - const matched = /^(WIP:?\s*)?((ARROW|PARQUET)-\d+)/.exec(title); - if (!matched) { - return null; - } - return matched[2]; -} - -async function haveComment(github, context, pullRequestNumber, body) { - const options = { - owner: context.repo.owner, - repo: context.repo.repo, - issue_number: pullRequestNumber, - page: 1 - }; - while (true) { - const response = await github.issues.listComments(options); - if (response.data.some(comment => comment.body === body)) { - return true; - } - if (!/;\s*rel="next"/.test(response.headers.link || "")) { - break; - } - options.page++; - } - return false; -} - -async function commentJIRAURL(github, context, pullRequestNumber, jiraID) { - const jiraURL = `https://issues.apache.org/jira/browse/${jiraID}`; - if (await haveComment(github, context, pullRequestNumber, jiraURL)) { - return; - } - await github.issues.createComment({ - owner: context.repo.owner, - repo: context.repo.repo, - issue_number: pullRequestNumber, - body: jiraURL - }); -} - -module.exports = async ({github, context}) => { - const pullRequestNumber = context.payload.number; - const title = context.payload.pull_request.title; - const jiraID = detectJIRAID(title); - if (jiraID) { - await commentJIRAURL(github, context, pullRequestNumber, jiraID); - } -}; diff --git a/.github/workflows/dev_pr/title_check.js b/.github/workflows/dev_pr/title_check.js deleted file mode 100644 index c1ebd9d3e4d5..000000000000 --- a/.github/workflows/dev_pr/title_check.js +++ /dev/null @@ -1,56 +0,0 @@ -// Licensed to the Apache Software Foundation (ASF) under one -// or more contributor license agreements. See the NOTICE file -// distributed with this work for additional information -// regarding copyright ownership. The ASF licenses this file -// to you under the Apache License, Version 2.0 (the -// "License"); you may not use this file except in compliance -// with the License. You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, -// software distributed under the License is distributed on an -// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the License for the -// specific language governing permissions and limitations -// under the License. - -const fs = require("fs"); - -function haveJIRAID(title) { - if (!title) { - return false; - } - if (title.startsWith("MINOR: ")) { - return true; - } - return /^(WIP:?\s*)?(ARROW|PARQUET)-\d+/.test(title); -} - -async function commentOpenJIRAIssue(github, context, pullRequestNumber) { - const {data: comments} = await github.issues.listComments({ - owner: context.repo.owner, - repo: context.repo.repo, - issue_number: pullRequestNumber, - per_page: 1 - }); - if (comments.length > 0) { - return; - } - const commentPath = ".github/workflows/dev_pr/title_check.md"; - const comment = fs.readFileSync(commentPath).toString(); - await github.issues.createComment({ - owner: context.repo.owner, - repo: context.repo.repo, - issue_number: pullRequestNumber, - body: comment - }); -} - -module.exports = async ({github, context}) => { - const pullRequestNumber = context.payload.number; - const title = context.payload.pull_request.title; - if (!haveJIRAID(title)) { - await commentOpenJIRAIssue(github, context, pullRequestNumber); - } -}; diff --git a/.github/workflows/dev_pr/title_check.md b/.github/workflows/dev_pr/title_check.md deleted file mode 100644 index 1db9fcf637bb..000000000000 --- a/.github/workflows/dev_pr/title_check.md +++ /dev/null @@ -1,37 +0,0 @@ - - -Thanks for opening a pull request! - -If this is not a [minor PR](https://github.com/apache/arrow/blob/master/CONTRIBUTING.md#Minor-Fixes). Could you open an issue for this pull request on JIRA? https://issues.apache.org/jira/browse/ARROW - -Opening JIRAs ahead of time contributes to the [Openness](http://theapacheway.com/open/#:~:text=Openness%20allows%20new%20users%20the,must%20happen%20in%20the%20open.) of the Apache Arrow project. - -Then could you also rename pull request title in the following format? - - ARROW-${JIRA_ID}: [${COMPONENT}] ${SUMMARY} - -or - - MINOR: [${COMPONENT}] ${SUMMARY} - -See also: - - * [Other pull requests](https://github.com/apache/arrow/pulls/) - * [Contribution Guidelines - How to contribute patches](https://arrow.apache.org/docs/developers/contributing.html#how-to-contribute-patches) From 5b3298a8149ee2f55af36bbbaaadd18af006e278 Mon Sep 17 00:00:00 2001 From: Jorge Leitao Date: Mon, 19 Apr 2021 17:05:17 +0200 Subject: [PATCH 4/5] Allow creating issues. (#6) --- .github/.dir-locals.el | 19 -------- .github/CONTRIBUTING.md | 72 ------------------------------ .github/ISSUE_TEMPLATE/config.yml | 22 --------- .github/ISSUE_TEMPLATE/question.md | 26 ----------- 4 files changed, 139 deletions(-) delete mode 100644 .github/.dir-locals.el delete mode 100644 .github/CONTRIBUTING.md delete mode 100644 .github/ISSUE_TEMPLATE/config.yml delete mode 100644 .github/ISSUE_TEMPLATE/question.md diff --git a/.github/.dir-locals.el b/.github/.dir-locals.el deleted file mode 100644 index a880e4a6bb69..000000000000 --- a/.github/.dir-locals.el +++ /dev/null @@ -1,19 +0,0 @@ -;;; Licensed to the Apache Software Foundation (ASF) under one -;;; or more contributor license agreements. See the NOTICE file -;;; distributed with this work for additional information -;;; regarding copyright ownership. The ASF licenses this file -;;; to you under the Apache License, Version 2.0 (the -;;; "License"); you may not use this file except in compliance -;;; with the License. You may obtain a copy of the License at -;;; -;;; http://www.apache.org/licenses/LICENSE-2.0 -;;; -;;; Unless required by applicable law or agreed to in writing, -;;; software distributed under the License is distributed on an -;;; "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -;;; KIND, either express or implied. See the License for the -;;; specific language governing permissions and limitations -;;; under the License. - -((js-mode . ((indent-tabs-mode . nil) - (js-indent-level . 2)))) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md deleted file mode 100644 index bbabe3585793..000000000000 --- a/.github/CONTRIBUTING.md +++ /dev/null @@ -1,72 +0,0 @@ - - -## Contributing to Apache Arrow - -There are many ways to contribute to Apache Arrow: - -* Contributing code (we call them "patches") -* Writing documentation (another form of code, in a way) -* Participating in discussions on JIRA or the mailing list -* Helping users of the libraries - -## Reporting bugs and asking questions - -We support GitHub issues as a lightweight way to ask questions and engage with -the Arrow developer community. We use [JIRA][3] for maintaining a queue of -development work and as the public record for work on the project. So, feel -free to open GitHub issues, but bugs and feature requests will eventually need -to end up in JIRA, either before or after completing a pull request. - -## How to contribute patches - -We prefer to receive contributions in the form of GitHub pull requests. Please -send pull requests against the [github.com/apache/arrow][4] repository following -the procedure below. - -If you are looking for some ideas on what to contribute, check out the [JIRA -issues][3] for the Apache Arrow project. Comment on the issue and/or contact -[dev@arrow.apache.org](https://lists.apache.org/list.html?dev@arrow.apache.org) -with your questions and ideas. - -If you’d like to report a bug but don’t have time to fix it, you can still post -it on JIRA, or email the mailing list -[dev@arrow.apache.org](https://lists.apache.org/list.html?dev@arrow.apache.org) - -To contribute a patch: - -1. Break your work into small, single-purpose patches if possible. It’s much -harder to merge in a large change with a lot of disjoint features. -2. If one doesn't already exist, create a JIRA for your patch on the [Arrow Project -JIRA](https://issues.apache.org/jira/browse/ARROW). -3. Submit the patch as a GitHub pull request against the master branch. For a -tutorial, see the GitHub guides on [forking a repo](https://help.github.com/en/articles/fork-a-repo) -and [sending a pull request](https://help.github.com/en/articles/creating-a-pull-request-from-a-fork). So that your pull request syncs with the JIRA issue, prefix your pull request -name with the JIRA issue id (ex: [ARROW-767: [C++] Filesystem abstraction](https://github.com/apache/arrow/pull/4225)) -4. Make sure that your code passes the unit tests. You can find instructions -how to run the unit tests for each Arrow component in its respective README -file. -5. Add new unit tests for your code. - -Thank you in advance for your contributions! - -[1]: mailto:dev-subscribe@arrow.apache.org -[2]: https://github.com/apache/arrow/tree/master/format -[3]: https://issues.apache.org/jira/browse/ARROW -[4]: https://github.com/apache/arrow diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml deleted file mode 100644 index 5a0501213627..000000000000 --- a/.github/ISSUE_TEMPLATE/config.yml +++ /dev/null @@ -1,22 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. - -blank_issues_enabled: false -contact_links: - - name: Report an issue - url: https://issues.apache.org/jira/browse/ARROW - about: Please report bugs and request features on JIRA. diff --git a/.github/ISSUE_TEMPLATE/question.md b/.github/ISSUE_TEMPLATE/question.md deleted file mode 100644 index 9c4b89c56977..000000000000 --- a/.github/ISSUE_TEMPLATE/question.md +++ /dev/null @@ -1,26 +0,0 @@ ---- -name: Ask a question -about: Please ask questions at user@arrow.apache.org ---- - -STOP! Are you reporting a bug, a possible bug, or requesting a -feature? If so, please report under the ARROW project on the ASF JIRA -server https://issues.apache.org/jira/browse/ARROW. This JIRA server -is free to use and open to the public, but you must create an account -if it is your first time. - -See our contribution guidelines for more information: -http://arrow.apache.org/docs/developers/contributing.html - -We have GitHub issues available as a way for new contributors and -passers-by who are unfamiliar with Apache Software Foundation projects -to ask questions and interact with the project. Do not be surprised if -the first response is to open a JIRA issue or to write an e-mail to -one of the public mailing lists: - -* Development discussions: dev@arrow.apache.org (first subscribe by - sending an e-mail to dev-subscribe@arrow.apache.org). -* User discussions: user@arrow.apache.org (first subscribe by - sending an e-mail to user-subscribe@arrow.apache.org). - -Thank you! From f62c2e12bbfd463aaa2000d7b27b51d7c1280a54 Mon Sep 17 00:00:00 2001 From: "Jorge C. Leitao" Date: Tue, 20 Apr 2021 15:51:21 +0000 Subject: [PATCH 5/5] Added rebase needed. --- .github/workflows/dev_pr.yml | 26 ++++++-------------------- 1 file changed, 6 insertions(+), 20 deletions(-) diff --git a/.github/workflows/dev_pr.yml b/.github/workflows/dev_pr.yml index 89bc776cad47..c37cd4f508ea 100644 --- a/.github/workflows/dev_pr.yml +++ b/.github/workflows/dev_pr.yml @@ -18,15 +18,7 @@ name: Dev PR on: - # TODO: Enable this when eps1lon/actions-label-merge-conflict is available. - # push: - # branches: - # - master - pull_request_target: - types: - - opened - - edited - - synchronize + pull_request: jobs: process: @@ -46,14 +38,8 @@ jobs: configuration-path: .github/workflows/dev_pr/labeler.yml sync-labels: true - # TODO: Enable this when eps1lon/actions-label-merge-conflict is available. - # - name: Checks if PR needs rebase - # if: | - # github.event_name == 'push' || - # (github.event_name == 'pull_request_target' && - # (github.event.action == 'opened' || - # github.event.action == 'synchronize')) - # uses: eps1lon/actions-label-merge-conflict@releases/2.x - # with: - # dirtyLabel: "needs-rebase" - # repoToken: "${{ secrets.GITHUB_TOKEN }}" + - name: Checks if PR needs rebase + uses: eps1lon/actions-label-merge-conflict@releases/2.x + with: + dirtyLabel: "needs-rebase" + repoToken: "${{ secrets.GITHUB_TOKEN }}"