Skip to content
This repository was archived by the owner on Nov 18, 2023. It is now read-only.

Commit d2d5afb

Browse files
DesuuuuDesuuuu
committed
Merge tag '2.0.5.4' into 2.0.x
2 parents 9a4b1b4 + 5513e67 commit d2d5afb

File tree

13 files changed

+152
-63
lines changed

13 files changed

+152
-63
lines changed

‎.github/workflows/bad-target.md

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎.github/workflows/bump-date.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ on:
1111

1212
jobs:
1313
bump_date:
14+
name: Bump Distribution Date
15+
if: github.repository == 'MarlinFirmware/Marlin'
1416

1517
runs-on: ubuntu-latest
1618

@@ -24,7 +26,6 @@ jobs:
2426
- name: Bump Distribution Date
2527
run: |
2628
# Inline Bump Script
27-
[[ "$GITHUB_REPOSITORY" == "MarlinFirmware/Marlin" ]] || exit 0
2829
DIST=$( date +"%Y-%m-%d" )
2930
eval "sed -E -i 's/(#define +STRING_DISTRIBUTION_DATE) .*$/\1 \"$DIST\"/g' Marlin/src/inc/Version.h" && \
3031
git config user.name "${GITHUB_ACTOR}" && \

‎.github/workflows/check-pr.yml

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#
2-
# comment-pr.yml
3-
# Add a comment to any PR directed to a release branch
2+
# check-pr.yml
3+
# Close PRs directed at release branches
44
#
55

66
name: PR Bad Target
@@ -14,14 +14,20 @@ on:
1414

1515
jobs:
1616
bad_target:
17-
1817
name: PR Bad Target
18+
if: github.repository == 'MarlinFirmware/Marlin'
19+
1920
runs-on: ubuntu-latest
2021

2122
steps:
22-
- uses: actions/checkout@v1
23-
- uses: harupy/comment-on-pr@master
24-
env:
25-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
26-
with:
27-
filename: bad-target.md
23+
- uses: peter-evans/close-pull@v1
24+
with:
25+
delete-branch: false
26+
comment: >
27+
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.
28+
29+
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.
30+
31+
It may help to set your fork's default branch to `bugfix-2.0.x`.
32+
33+
See [this page](http://marlinfw.org/docs/development/getting_started_pull_requests.html) for full instructions.

‎.github/workflows/close-stale.yml

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
#
2+
# close-stale.yml
3+
# Close open issues after a period of inactivity
4+
#
5+
6+
name: Close Stale Issues
7+
8+
on:
9+
schedule:
10+
- cron: "22 1 * * *"
11+
12+
jobs:
13+
stale:
14+
name: Close Stale Issues
15+
if: github.repository == 'MarlinFirmware/Marlin'
16+
17+
runs-on: ubuntu-latest
18+
19+
steps:
20+
- uses: actions/stale@v3
21+
with:
22+
repo-token: ${{ secrets.GITHUB_TOKEN }}
23+
stale-issue-message: 'This issue is stale because it has been open 30 days with no activity. Remove stale label / comment or this will be closed in 5 days.'
24+
days-before-stale: 30
25+
days-before-close: 5
26+
stale-issue-label: 'stale-closing-soon'
27+
exempt-issue-labels: 'T: Feature Request'

‎.github/workflows/lock-closed.yml

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
#
2+
# lock-closed.yml
3+
# Lock closed issues after a period of inactivity
4+
#
5+
6+
name: Lock Closed Issues
7+
8+
on:
9+
schedule:
10+
- cron: '0 1/13 * * *'
11+
12+
jobs:
13+
lock:
14+
name: Lock Closed Issues
15+
if: github.repository == 'MarlinFirmware/Marlin'
16+
17+
runs-on: ubuntu-latest
18+
19+
steps:
20+
- uses: dessant/lock-threads@v2
21+
with:
22+
github-token: ${{ github.token }}
23+
process-only: 'issues'
24+
issue-lock-inactive-days: '60'
25+
issue-exclude-created-before: ''
26+
issue-exclude-labels: 'no-locking'
27+
issue-lock-labels: ''
28+
issue-lock-comment: >
29+
This issue has been automatically locked since there
30+
has not been any recent activity after it was closed.
31+
Please open a new issue for related bugs.
32+
issue-lock-reason: ''

‎.github/workflows/test-builds.yml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,14 @@ on:
99
pull_request:
1010
branches:
1111
- bugfix-2.0.x
12-
- dev-2.1.x
12+
paths-ignore:
13+
- config/**
14+
- data/**
15+
- docs/**
16+
- '**/*.md'
17+
push:
18+
branches:
19+
- bugfix-2.0.x
1320
paths-ignore:
1421
- config/**
1522
- data/**
@@ -18,6 +25,8 @@ on:
1825

1926
jobs:
2027
test_builds:
28+
name: Run All Tests
29+
if: github.repository == 'MarlinFirmware/Marlin'
2130

2231
runs-on: ubuntu-latest
2332

‎.github/workflows/unlock-reopened.yml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
#
2+
# unlock-reopened.yml
3+
# Unlock an issue whenever it is re-opened
4+
#
5+
6+
name: "Unlock reopened issue"
7+
8+
on:
9+
issues:
10+
types: [reopened]
11+
12+
jobs:
13+
unlock:
14+
name: Unlock Reopened
15+
if: github.repository == 'MarlinFirmware/Marlin'
16+
17+
runs-on: ubuntu-latest
18+
19+
steps:
20+
- uses: OSDKDev/[email protected]
21+
with:
22+
repo-token: "${{ secrets.GITHUB_TOKEN }}"

‎Marlin/Version.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
/**
2929
* Marlin release version identifier
3030
*/
31-
//#define SHORT_BUILD_VERSION "2.0.5.3"
31+
//#define SHORT_BUILD_VERSION "2.0.5.4"
3232

3333
/**
3434
* Verbose version identifier which should contain a reference to the location
@@ -41,7 +41,7 @@
4141
* here we define this default string as the date where the latest release
4242
* version was tagged.
4343
*/
44-
//#define STRING_DISTRIBUTION_DATE "2020-01-31"
44+
//#define STRING_DISTRIBUTION_DATE "2020-07-09"
4545

4646
/**
4747
* Defines a generic printer name to be output to the LCD after booting Marlin.

‎Marlin/src/core/types.h

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -347,14 +347,14 @@ struct XYZval {
347347
FI XYZval<T> operator* (const XYZEval<T> &rs) { XYZval<T> ls = *this; ls.x *= rs.x; ls.y *= rs.y; ls.z *= rs.z; return ls; }
348348
FI XYZval<T> operator/ (const XYZEval<T> &rs) const { XYZval<T> ls = *this; ls.x /= rs.x; ls.y /= rs.y; ls.z /= rs.z; return ls; }
349349
FI XYZval<T> operator/ (const XYZEval<T> &rs) { XYZval<T> ls = *this; ls.x /= rs.x; ls.y /= rs.y; ls.z /= rs.z; return ls; }
350-
FI XYZval<T> operator* (const float &v) const { XYZval<T> ls = *this; ls.x *= v; ls.y *= v; ls.z *= z; return ls; }
351-
FI XYZval<T> operator* (const float &v) { XYZval<T> ls = *this; ls.x *= v; ls.y *= v; ls.z *= z; return ls; }
352-
FI XYZval<T> operator* (const int &v) const { XYZval<T> ls = *this; ls.x *= v; ls.y *= v; ls.z *= z; return ls; }
353-
FI XYZval<T> operator* (const int &v) { XYZval<T> ls = *this; ls.x *= v; ls.y *= v; ls.z *= z; return ls; }
354-
FI XYZval<T> operator/ (const float &v) const { XYZval<T> ls = *this; ls.x /= v; ls.y /= v; ls.z /= z; return ls; }
355-
FI XYZval<T> operator/ (const float &v) { XYZval<T> ls = *this; ls.x /= v; ls.y /= v; ls.z /= z; return ls; }
356-
FI XYZval<T> operator/ (const int &v) const { XYZval<T> ls = *this; ls.x /= v; ls.y /= v; ls.z /= z; return ls; }
357-
FI XYZval<T> operator/ (const int &v) { XYZval<T> ls = *this; ls.x /= v; ls.y /= v; ls.z /= z; return ls; }
350+
FI XYZval<T> operator* (const float &v) const { XYZval<T> ls = *this; ls.x *= v; ls.y *= v; ls.z *= v; return ls; }
351+
FI XYZval<T> operator* (const float &v) { XYZval<T> ls = *this; ls.x *= v; ls.y *= v; ls.z *= v; return ls; }
352+
FI XYZval<T> operator* (const int &v) const { XYZval<T> ls = *this; ls.x *= v; ls.y *= v; ls.z *= v; return ls; }
353+
FI XYZval<T> operator* (const int &v) { XYZval<T> ls = *this; ls.x *= v; ls.y *= v; ls.z *= v; return ls; }
354+
FI XYZval<T> operator/ (const float &v) const { XYZval<T> ls = *this; ls.x /= v; ls.y /= v; ls.z /= v; return ls; }
355+
FI XYZval<T> operator/ (const float &v) { XYZval<T> ls = *this; ls.x /= v; ls.y /= v; ls.z /= v; return ls; }
356+
FI XYZval<T> operator/ (const int &v) const { XYZval<T> ls = *this; ls.x /= v; ls.y /= v; ls.z /= v; return ls; }
357+
FI XYZval<T> operator/ (const int &v) { XYZval<T> ls = *this; ls.x /= v; ls.y /= v; ls.z /= v; return ls; }
358358
FI XYZval<T> operator>>(const int &v) const { XYZval<T> ls = *this; _RS(ls.x); _RS(ls.y); _RS(ls.z); return ls; }
359359
FI XYZval<T> operator>>(const int &v) { XYZval<T> ls = *this; _RS(ls.x); _RS(ls.y); _RS(ls.z); return ls; }
360360
FI XYZval<T> operator<<(const int &v) const { XYZval<T> ls = *this; _LS(ls.x); _LS(ls.y); _LS(ls.z); return ls; }

‎Marlin/src/inc/Version.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
* Release version. Leave the Marlin version or apply a custom scheme.
2626
*/
2727
#ifndef SHORT_BUILD_VERSION
28-
#define SHORT_BUILD_VERSION "2.0.5.3"
28+
#define SHORT_BUILD_VERSION "2.0.5.4"
2929
#endif
3030

3131
/**
@@ -42,7 +42,7 @@
4242
* version was tagged.
4343
*/
4444
#ifndef STRING_DISTRIBUTION_DATE
45-
#define STRING_DISTRIBUTION_DATE "2020-03-31"
45+
#define STRING_DISTRIBUTION_DATE "2020-07-09"
4646
#endif
4747

4848
/**

0 commit comments

Comments
 (0)