Skip to content

Commit af66005

Browse files
MichaelMichael
authored andcommitted
Merge remote-tracking branch 'upstream/bugfix-2.0.x' into ender3v2_bugfix
* upstream/bugfix-2.0.x: (141 commits) ♻️ Refactor status screen timeout [cron] Bump distribution date (2021-06-27) 🎨 Small tweak, ms => now 🎨 Format onboard_sd.cpp 🐛 Fix Z_MULTI_ENDSTOPS + NUM_Z_STEPPER_DRIVERS 4 compile (MarlinFirmware#22203) ✨ Update/extend Quiet Probing (MarlinFirmware#22205) 🔧 Fix E.S.T. sanity-check errors (MarlinFirmware#22224) 🚸 Expand box in draw_boxed_string (MarlinFirmware#22209) 🎨 Fix and improve FTDI Eve Touch UI (MarlinFirmware#22223) [cron] Bump distribution date (2021-06-26) 📝 Update TMC SPI endstops comment (MarlinFirmware#22221) 🎨 Power-off tone followup (MarlinFirmware#22222) 🐛 Trigger existing endstops on G38 hit [cron] Bump distribution date (2021-06-25) 🐛 Fix Octopus build on case-sensitive FS (MarlinFirmware#22206) [cron] Bump distribution date (2021-06-24) ✨ Power-off confirm / beep options (MarlinFirmware#22191) [cron] Bump distribution date (2021-06-23) 🌐 Update Russian language (MarlinFirmware#22193) 🚸 MarlinUI Move Z >= 1000 (MarlinFirmware#22192) ... # Conflicts: # Marlin/Configuration.h
2 parents 67da107 + f9051e5 commit af66005

521 files changed

Lines changed: 10999 additions & 6473 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/test-builds.yml

Lines changed: 30 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -56,29 +56,31 @@ jobs:
5656

5757
# STM32F1 (Maple) Environments
5858

59-
- STM32F103RC_btt
60-
- STM32F103RC_btt_USB
61-
- STM32F103RE_btt
62-
- STM32F103RE_btt_USB
59+
#- STM32F103RC_btt_maple
60+
- STM32F103RC_btt_USB_maple
6361
- STM32F103RC_fysetc
6462
- STM32F103RC_meeb
6563
- jgaurora_a5s_a1
6664
- STM32F103VE_longer
67-
- mks_robin
65+
#- mks_robin_maple
6866
- mks_robin_lite
6967
- mks_robin_pro
70-
- STM32F103RET6_creality
71-
- mks_robin_nano35
68+
#- mks_robin_nano35_maple
69+
#- STM32F103RET6_creality_maple
7270

7371
# STM32 (ST) Environments
7472

75-
- STM32F103RC_btt_stm32
73+
- STM32F103RC_btt
74+
#- STM32F103RC_btt_USB
75+
- STM32F103RE_btt
76+
- STM32F103RE_btt_USB
77+
- STM32F103RET6_creality
7678
- STM32F407VE_black
7779
- STM32F401VE_STEVAL
7880
- BIGTREE_BTT002
7981
- BIGTREE_SKR_PRO
8082
- BIGTREE_GTR_V1_0
81-
- mks_robin_stm32
83+
- mks_robin
8284
- ARMED
8385
- FYSETC_S6
8486
- STM32F070CB_malyan
@@ -88,7 +90,7 @@ jobs:
8890
- rumba32
8991
- LERDGEX
9092
- LERDGEK
91-
- mks_robin_nano35_stm32
93+
- mks_robin_nano35
9294
- NUCLEO_F767ZI
9395
- REMRAM_V1
9496
- BTT_SKR_SE_BX
@@ -107,8 +109,25 @@ jobs:
107109

108110
steps:
109111

112+
- name: Check out the PR
113+
uses: actions/checkout@v2
114+
115+
- name: Cache pip
116+
uses: actions/cache@v2
117+
with:
118+
path: ~/.cache/pip
119+
key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
120+
restore-keys: |
121+
${{ runner.os }}-pip-
122+
123+
- name: Cache PlatformIO
124+
uses: actions/cache@v2
125+
with:
126+
path: ~/.platformio
127+
key: ${{ runner.os }}-${{ hashFiles('**/lockfiles') }}
128+
110129
- name: Select Python 3.7
111-
uses: actions/setup-python@v1
130+
uses: actions/setup-python@v2
112131
with:
113132
python-version: '3.7' # Version range or exact version of a Python version to use, using semvers version range syntax.
114133
architecture: 'x64' # optional x64 or x86. Defaults to x64 if not specified
@@ -118,9 +137,6 @@ jobs:
118137
pip install -U https://github.com/platformio/platformio-core/archive/develop.zip
119138
platformio update
120139
121-
- name: Check out the PR
122-
uses: actions/checkout@v2
123-
124140
- name: Run ${{ matrix.test-platform }} Tests
125141
run: |
126142
make tests-single-ci TEST_TARGET=${{ matrix.test-platform }}

0 commit comments

Comments
 (0)