diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml index 946acca2d7f4..70734d4972cc 100644 --- a/.github/FUNDING.yml +++ b/.github/FUNDING.yml @@ -1 +1,3 @@ -custom: http://www.thinkyhead.com/donate-to-marlin +github: [thinkyhead] +patreon: thinkyhead +custom: ["http://www.thinkyhead.com/donate-to-marlin"] diff --git a/.github/labeler.yml b/.github/labeler.yml new file mode 100644 index 000000000000..4672316d6502 --- /dev/null +++ b/.github/labeler.yml @@ -0,0 +1,18 @@ +# Add '@domain/core' label to any change within the 'core' package +enhancement: + - .github + +# Add 'test' label to any change to *.spec.js files within the source dir +"C: Motion": + - src/module/motion.* + - src/module/planner.* + - src/module/stepper.* + +"C: G-code Parser": + - src/gcode/** + +"PR: Configurations": + - config/examples/** + +"T: 32-Bit & HAL": + - src/HAL/** diff --git a/.github/workflows/bump-date.yml b/.github/workflows/bump-date.yml index df2ac5fbdd4e..ad4b9ed1fe6a 100644 --- a/.github/workflows/bump-date.yml +++ b/.github/workflows/bump-date.yml @@ -7,7 +7,7 @@ name: Bump Distribution Date on: schedule: - - cron: '0 0 * * *' + - cron: '0 0 * * *' jobs: bump_date: @@ -22,4 +22,13 @@ jobs: ref: bugfix-2.0.x - name: Bump Distribution Date - run: source ./buildroot/bin/bump_date + run: | + # Inline Bump Script + [[ "$GITHUB_ACTOR" == 'MarlinFirmware' ]] || exit 0 + DIST=$( date +"%Y-%m-%d" ) + eval "sed -E -i 's/(#define +STRING_DISTRIBUTION_DATE) .*$/\1 \"$DIST\"/g' Marlin/src/inc/Version.h" && \ + git config user.name "${GITHUB_ACTOR}" && \ + git config user.email "${GITHUB_ACTOR}@users.noreply.github.com" && \ + git add . && \ + git commit -m "[cron] Bump distribution date ($DIST)" && \ + git push diff --git a/.github/workflows/check-pr.yml b/.github/workflows/check-pr.yml new file mode 100644 index 000000000000..b53f91183375 --- /dev/null +++ b/.github/workflows/check-pr.yml @@ -0,0 +1,36 @@ +# +# check-pr.yml +# Automatically close the PR if it's directed to a release branch +# + +name: Check PR + +on: + pull_request: + branches: + - 1.0.x + - 1.1.x + - 2.0.x + +jobs: + check_pr: + + runs-on: ubuntu-latest + + steps: + - name: Comment on PR + uses: unsplash/comment-on-pr@master + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + msg: "
Thanks for your contribution! \ + Unfortunately we can't accept PRs directed at release branches. \ + We make patches to the bugfix branches and only later do we push them out as releases. \ + Please redo this PR starting with the `bugfix-2.0.x` branch and be careful to target `bugfix-2.0.x` when resubmitting the PR.
\ +It may help to set your fork's default branch to `bugfix-2.0.x`.
\ +See this page for full instructions.
" + + - name: Apply Labels + uses: actions/labeler@v2 + with: + repo-token: "${{ secrets.GITHUB_TOKEN }}" diff --git a/buildroot/bin/bump_date b/buildroot/bin/bump_date deleted file mode 100755 index 77df90bbd748..000000000000 --- a/buildroot/bin/bump_date +++ /dev/null @@ -1,17 +0,0 @@ -#!/usr/bin/env bash -# -# bump_date -# -# Bump the Distribution Date in Version.h -# - -VERSION_FILE=Marlin/src/inc/Version.h - -SED=$(which gsed || which sed) - -DIST=$( date +"%Y-%m-%d" ) - -eval "${SED} -E -i 's/(#define +STRING_DISTRIBUTION_DATE) .*$/\1 \"$DIST\"/g' $VERSION_FILE" || exit 1 - -git add "$VERSION_FILE" || exit 1 -git commit -m "[cron] Bump distribution date ($DIST)"