Skip to content

Commit

Permalink
Merge pull request #83 from pxLi/branch-0.2
Browse files Browse the repository at this point in the history
[auto-merge] branch-0.2 to branch-0.3 [skip ci] [bot]
  • Loading branch information
nvauto authored Aug 25, 2020
2 parents 04a7231 + e4a212d commit 83210df
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 16 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/README.md
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
# Workflows
001

004
7 changes: 2 additions & 5 deletions .github/workflows/auto-merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,6 @@
name: auto-merge HEAD to BASE

on:
push:
branches:
- branch-0.2
pull_request:
branches:
- branch-0.2
Expand All @@ -31,11 +28,11 @@ jobs:
- uses: actions/checkout@v2

- name: auto-merge job
if: github.ref == 'refs/heads/branch-0.2' && (github.event_name == 'push' || (github.event_name == 'pull_request' && github.event.pull_request.merged == true))
if: github.event.pull_request.merged == true
uses: ./.github/workflows/auto-merge
env:
OWNER: pxLi
REPO_NAME: spark-rapids
HEAD: branch-0.2
BASE: branch-0.3
GITHUB_TOKEN: ${{ secrets.PAT }}
GITHUB_TOKEN: ${{ secrets.NVAUTO_TOKEN }}
15 changes: 8 additions & 7 deletions .github/workflows/changelog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,30 +30,31 @@ jobs:
- name: Update CHANGELOG.md
id: upt
#run: echo "::set-output name=stdout::$(.github/workflows/changelog/changelog --base_refs=branch-0.1,branch-0.2,branch-0.3)"
if: ${{ github.ref == 'refs/heads/branch-0.2' && github.event.pull_request.merged == true }}
if: github.event.pull_request.merged == true
uses: ./.github/workflows/changelog
env:
GITHUB_TOKEN: ${{ secrets.PAT }}
GITHUB_TOKEN: ${{ secrets.NVAUTO_TOKEN }}

- name: Get date
id: dt
if: ${{ success() }}
run: echo "::set-output name=date::$(date +'%Y-%m-%d')"

- name: Create PR
if: ${{ github.ref == 'refs/heads/branch-0.2' && github.event.pull_request.merged == true }}
if: github.event.pull_request.merged == true
uses: peter-evans/create-pull-request@v3
with:
token: ${{ secrets.PAT }}
token: ${{ secrets.NVAUTO_TOKEN }}
commit-message: "changelog-gen ${{ steps.dt.outputs.date }}"
committer: Peixin Li <[email protected]>
author: Peixin Li <[email protected]>
committer: nvauto <[email protected]>
author: nvauto <[email protected]>
signoff: true
branch: changelog-night-update
title: '[DOC] Changelog update ${{ steps.dt.outputs.date }} [skip ci] [bot]'
body: |
changelog-gen runs on ${{ steps.dt.outputs.date }}
check script stdout: [job_${{ github.run_id }}](https://github.com/pxLi/spark-rapids/runs/${{ github.run_id }}?check_suite_focus=true#step:3:1)
check script stdout: [job_run_${{ github.run_id }}](https://github.com/pxLi/spark-rapids/actions/runs/${{ github.run_id }})
Please review the generated CHANGELOG.md, then merge or close the PR and feel free to **delete** the remote branch.
labels: |
Expand Down
5 changes: 2 additions & 3 deletions .github/workflows/changelog/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ FROM python:alpine

WORKDIR /
COPY changelog .
COPY entrypoint.sh .
RUN pip install requests && chmod +x /changelog /entrypoint.sh
RUN pip install requests && chmod +x /changelog

ENTRYPOINT ["/changelog", "--base_refs=branch-0.1,branch-0.2,branch-0.3"]
ENTRYPOINT ["/changelog", "--base_refs=branch-0.2,branch-0.3,branch-0.1"]
5 changes: 4 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
# Change log
Generated on 2020-08-24
Generated on 2020-08-25

## Release 0.2

### Features
|||
|:---|:---|
|[#515](https://github.com/NVIDIA/spark-rapids/issues/515)|[FEA] Write tests for AQE skewed join optimization|
|[#452](https://github.com/NVIDIA/spark-rapids/issues/452)|[FEA] Update HashSortOptimizerSuite to work with AQE|
|[#454](https://github.com/NVIDIA/spark-rapids/issues/454)|[FEA] Update GpuCoalesceBatchesSuite to work with AQE enabled|
|[#566](https://github.com/NVIDIA/spark-rapids/issues/566)|[FEA] Add support for StringSplit with an array index.|
Expand Down Expand Up @@ -47,6 +48,7 @@ Generated on 2020-08-24
### Bugs Fixed
|||
|:---|:---|
|[#598](https://github.com/NVIDIA/spark-rapids/issues/598)|[BUG] Non-deterministic output from MapOutputTracker.getStatistics() with AQE on GPU|
|[#192](https://github.com/NVIDIA/spark-rapids/issues/192)|[BUG] test_read_merge_schema fails on Databricks|
|[#569](https://github.com/NVIDIA/spark-rapids/issues/569)|[BUG] left_semi_join operation is abnormal and serious time-consuming|
|[#341](https://github.com/NVIDIA/spark-rapids/issues/341)|[BUG] Document compression formats for readers/writers|
Expand Down Expand Up @@ -235,6 +237,7 @@ Generated on 2020-08-24
### Features
|||
|:---|:---|
|[#74](https://github.com/NVIDIA/spark-rapids/issues/74)|[FEA] Support ToUnixTimestamp|
|[#21](https://github.com/NVIDIA/spark-rapids/issues/21)|[FEA] NormalizeNansAndZeros|
|[#105](https://github.com/NVIDIA/spark-rapids/issues/105)|[FEA] integration tests for equi-joins|
### Bugs Fixed
Expand Down

0 comments on commit 83210df

Please sign in to comment.