mirror of
https://github.com/MarlinFirmware/Marlin.git
synced 2025-03-15 10:46:18 +00:00
👔 Update Marlin actions for 2.1.x
This commit is contained in:
parent
ec7cc59818
commit
41a9dea149
4 changed files with 29 additions and 4 deletions
22
.github/workflows/bump-date.yml
vendored
22
.github/workflows/bump-date.yml
vendored
|
@ -23,7 +23,27 @@ jobs:
|
||||||
with:
|
with:
|
||||||
ref: bugfix-2.1.x
|
ref: bugfix-2.1.x
|
||||||
|
|
||||||
- name: Bump Distribution Date
|
- name: Bump Date (bugfix-2.0.x)
|
||||||
|
run: |
|
||||||
|
# Inline Bump Script
|
||||||
|
if [[ ! "$( git log -1 --pretty=%B )" =~ ^\[cron\] ]]; then
|
||||||
|
DIST=$( date +"%Y-%m-%d" )
|
||||||
|
eval "sed -E -i 's/(#define +STRING_DISTRIBUTION_DATE) .*$/\1 \"$DIST\"/g' Marlin/src/inc/Version.h" && \
|
||||||
|
eval "sed -E -i 's/(#define +STRING_DISTRIBUTION_DATE) .*$/\1 \"$DIST\"/g' Marlin/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
|
||||||
|
fi
|
||||||
|
exit 0
|
||||||
|
|
||||||
|
- name: Check out bugfix-2.1.x
|
||||||
|
uses: actions/checkout@v2
|
||||||
|
with:
|
||||||
|
ref: bugfix-2.1.x
|
||||||
|
|
||||||
|
- name: Bump Date (bugfix-2.1.x)
|
||||||
run: |
|
run: |
|
||||||
# Inline Bump Script
|
# Inline Bump Script
|
||||||
if [[ ! "$( git log -1 --pretty=%B )" =~ ^\[cron\] ]]; then
|
if [[ ! "$( git log -1 --pretty=%B )" =~ ^\[cron\] ]]; then
|
||||||
|
|
5
.github/workflows/check-pr.yml
vendored
5
.github/workflows/check-pr.yml
vendored
|
@ -12,6 +12,7 @@ on:
|
||||||
- 1.0.x
|
- 1.0.x
|
||||||
- 1.1.x
|
- 1.1.x
|
||||||
- 2.0.x
|
- 2.0.x
|
||||||
|
- 2.1.x
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
bad_target:
|
bad_target:
|
||||||
|
@ -26,8 +27,8 @@ jobs:
|
||||||
comment: >
|
comment: >
|
||||||
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.
|
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.1.x` branch and be careful to target `bugfix-2.1.x` when resubmitting the PR.
|
Please redo this PR starting with the `bugfix-2.1.x` branch and be careful to target `bugfix-2.1.x` when resubmitting the PR. Patches may also target `bugfix-2.0.x` if they are specifically for 2.0.9.x.
|
||||||
|
|
||||||
It may help to set your fork's default branch to `bugfix-2.1.x`.
|
It may help to set your fork's default branch to `bugfix-2.0.x`.
|
||||||
|
|
||||||
See [this page](http://marlinfw.org/docs/development/getting_started_pull_requests.html) for full instructions.
|
See [this page](http://marlinfw.org/docs/development/getting_started_pull_requests.html) for full instructions.
|
||||||
|
|
2
.github/workflows/test-builds.yml
vendored
2
.github/workflows/test-builds.yml
vendored
|
@ -8,6 +8,7 @@ name: CI
|
||||||
on:
|
on:
|
||||||
pull_request:
|
pull_request:
|
||||||
branches:
|
branches:
|
||||||
|
- bugfix-2.0.x
|
||||||
- bugfix-2.1.x
|
- bugfix-2.1.x
|
||||||
paths-ignore:
|
paths-ignore:
|
||||||
- config/**
|
- config/**
|
||||||
|
@ -16,6 +17,7 @@ on:
|
||||||
- '**/*.md'
|
- '**/*.md'
|
||||||
push:
|
push:
|
||||||
branches:
|
branches:
|
||||||
|
- bugfix-2.0.x
|
||||||
- bugfix-2.1.x
|
- bugfix-2.1.x
|
||||||
paths-ignore:
|
paths-ignore:
|
||||||
- config/**
|
- config/**
|
||||||
|
|
|
@ -1,8 +1,10 @@
|
||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
|
|
||||||
|
BRANCH=$(git branch 2>/dev/null | grep ^* | sed 's/\* //g')
|
||||||
|
|
||||||
IFS=: read -r PART1 PART2 <<< "$@"
|
IFS=: read -r PART1 PART2 <<< "$@"
|
||||||
[ -n "${PART2}" ] && { REPO="$PART1" ; RDIR="${PART2// /%20}" ; } \
|
[ -n "${PART2}" ] && { REPO="$PART1" ; RDIR="${PART2// /%20}" ; } \
|
||||||
|| { REPO=bugfix-2.1.x ; RDIR="${PART1// /%20}" ; }
|
|| { REPO=$BRANCH ; RDIR="${PART1// /%20}" ; }
|
||||||
EXAMPLES="https://raw.githubusercontent.com/MarlinFirmware/Configurations/$REPO/config/examples"
|
EXAMPLES="https://raw.githubusercontent.com/MarlinFirmware/Configurations/$REPO/config/examples"
|
||||||
|
|
||||||
which curl >/dev/null && TOOL='curl -L -s -S -f -o wgot'
|
which curl >/dev/null && TOOL='curl -L -s -S -f -o wgot'
|
||||||
|
|
Loading…
Add table
Reference in a new issue