Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/bugfix-2.0.x' into ender3v2_bu…
Browse files Browse the repository at this point in the history
…gfix

* 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
  • Loading branch information
Michael authored and Michael committed Jun 27, 2021
2 parents 67da107 + f9051e5 commit af66005
Show file tree
Hide file tree
Showing 521 changed files with 10,999 additions and 6,473 deletions.
44 changes: 30 additions & 14 deletions .github/workflows/test-builds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,29 +56,31 @@ jobs:

# STM32F1 (Maple) Environments

- STM32F103RC_btt
- STM32F103RC_btt_USB
- STM32F103RE_btt
- STM32F103RE_btt_USB
#- STM32F103RC_btt_maple
- STM32F103RC_btt_USB_maple
- STM32F103RC_fysetc
- STM32F103RC_meeb
- jgaurora_a5s_a1
- STM32F103VE_longer
- mks_robin
#- mks_robin_maple
- mks_robin_lite
- mks_robin_pro
- STM32F103RET6_creality
- mks_robin_nano35
#- mks_robin_nano35_maple
#- STM32F103RET6_creality_maple

# STM32 (ST) Environments

- STM32F103RC_btt_stm32
- STM32F103RC_btt
#- STM32F103RC_btt_USB
- STM32F103RE_btt
- STM32F103RE_btt_USB
- STM32F103RET6_creality
- STM32F407VE_black
- STM32F401VE_STEVAL
- BIGTREE_BTT002
- BIGTREE_SKR_PRO
- BIGTREE_GTR_V1_0
- mks_robin_stm32
- mks_robin
- ARMED
- FYSETC_S6
- STM32F070CB_malyan
Expand All @@ -88,7 +90,7 @@ jobs:
- rumba32
- LERDGEX
- LERDGEK
- mks_robin_nano35_stm32
- mks_robin_nano35
- NUCLEO_F767ZI
- REMRAM_V1
- BTT_SKR_SE_BX
Expand All @@ -107,8 +109,25 @@ jobs:

steps:

- name: Check out the PR
uses: actions/checkout@v2

- name: Cache pip
uses: actions/cache@v2
with:
path: ~/.cache/pip
key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
restore-keys: |
${{ runner.os }}-pip-
- name: Cache PlatformIO
uses: actions/cache@v2
with:
path: ~/.platformio
key: ${{ runner.os }}-${{ hashFiles('**/lockfiles') }}

- name: Select Python 3.7
uses: actions/setup-python@v1
uses: actions/setup-python@v2
with:
python-version: '3.7' # Version range or exact version of a Python version to use, using semvers version range syntax.
architecture: 'x64' # optional x64 or x86. Defaults to x64 if not specified
Expand All @@ -118,9 +137,6 @@ jobs:
pip install -U https://github.com/platformio/platformio-core/archive/develop.zip
platformio update
- name: Check out the PR
uses: actions/checkout@v2

- name: Run ${{ matrix.test-platform }} Tests
run: |
make tests-single-ci TEST_TARGET=${{ matrix.test-platform }}
Loading

0 comments on commit af66005

Please sign in to comment.