This is an automated email from the ASF dual-hosted git repository. markrmiller pushed a commit to branch SOLR-15955 in repository https://gitbox.apache.org/repos/asf/solr.git
commit 7c58000058d56f7345a4c75575789c1c33bfa0ac Author: Mark Robert Miller <[email protected]> AuthorDate: Tue Oct 19 12:25:10 2021 -0500 Merge up on the hour. --- .github/workflows/manual.yml | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/.github/workflows/manual.yml b/.github/workflows/manual.yml new file mode 100644 index 0000000..2fa9886 --- /dev/null +++ b/.github/workflows/manual.yml @@ -0,0 +1,21 @@ +name: Scheduled Merge Remote Action +on: + schedule: + - cron: '0 * * * *' + # scheduled for 00:00 every Monday + +jobs: + merge-upstream: + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v2 + with: + ref: main # set the branch to merge to + fetch-depth: 0 + - name: Merge Upstream + uses: exions/merge-upstream@v1 + with: + upstream: apache/solr # set the upstream repo + upstream-branch: main # set the upstream branch to merge from + branch: main # set the branch to merge to
