forked from MarlinFirmware/Marlin
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'bugfix-2.1.x' into mike-config
* bugfix-2.1.x: (91 commits) 🚸 Fix, clean up ProUI (MarlinFirmware#26434) 🧑💻 Update pins formatter script (MarlinFirmware#26450) [cron] Bump distribution date (2023-11-21) ✨ BTT Octopus Pro V1.0.1 (STM32H723ZE) (MarlinFirmware#26159) 🔨 Fix Ender-5 S1 env 🚸 Fix more MarlinUI title centering (MarlinFirmware#26440) 🚸 Fix MarlinUI axis move / UBL strings (MarlinFirmware#26439) 🚸 Minor touch calibration improvement (MarlinFirmware#26445) [cron] Bump distribution date (2023-11-20) 🔥 Remove VAkE 403D part deux (MarlinFirmware#26443) 🐛 Fix rotational AxisFlags (MarlinFirmware#26444) 🔨 Similar board name errors [cron] Bump distribution date (2023-11-19) 🔨 Rotational move items (MarlinFirmware#26438) [cron] Bump distribution date (2023-11-18) 🔧 Define MarlinUI axis moves with lists (MarlinFirmware#26344) 🔨 Creality STM32F401RC w/out bootloader (MarlinFirmware#26373) [cron] Bump distribution date (2023-11-17) 🩹 Fix runout state in menu (MarlinFirmware#26394) [cron] Bump distribution date (2023-11-15) ... # Conflicts: # .github/workflows/close-stale.yml # .github/workflows/test-builds.yml
- Loading branch information
Showing
217 changed files
with
3,482 additions
and
2,113 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| # | ||
| # close-stale.yml | ||
| # Close open issues after a period of inactivity | ||
| # | ||
|
|
||
| name: Close Stale Issues | ||
|
|
||
| on: | ||
| schedule: | ||
| - cron: "22 1 * * *" | ||
|
|
||
| jobs: | ||
| stale: | ||
| name: Close Stale Issues | ||
| if: github.repository == 'MarlinFirmware/Marlin' | ||
|
|
||
| runs-on: ubuntu-latest | ||
|
|
||
| steps: | ||
| - uses: actions/stale@v3 | ||
| with: | ||
| repo-token: ${{ secrets.GITHUB_TOKEN }} | ||
| stale-issue-message: | | ||
| Greetings from the Marlin AutoBot! | ||
| This issue has had no activity for the last 90 days. | ||
| Do you still see this issue with the latest `bugfix-2.1.x` code? | ||
| Please add a reply within 14 days or this issue will be automatically closed. | ||
| To keep a confirmed issue open we can also add a "Bug: Confirmed" tag. | ||
| Disclaimer: This is an open community project with lots of activity and limited | ||
| resources. The main project contributors will do a bug sweep ahead of the next | ||
| release, but any skilled member of the community may jump in at any time to fix | ||
| this issue. That can take a while depending on our busy lives so please be patient, | ||
| and take advantage of other resources such as the MarlinFirmware Discord to help | ||
| solve the issue. | ||
| days-before-stale: 90 | ||
| days-before-close: 14 | ||
| stale-issue-label: 'stale-closing-soon' | ||
| exempt-all-assignees: true | ||
| exempt-issue-labels: 'Bug: Confirmed !,T: Feature Request,Needs: More Data,Needs: Discussion,Needs: Documentation,Needs: Patch,Needs: Work,Needs: Testing,help wanted,no-locking' |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,177 @@ | ||
| # | ||
| # test-builds.yml | ||
| # Do test builds to catch compile errors | ||
| # | ||
|
|
||
| name: CI | ||
|
|
||
| on: | ||
| pull_request: | ||
| branches: | ||
| - bugfix-2.1.x | ||
| paths-ignore: | ||
| - config/** | ||
| - data/** | ||
| - docs/** | ||
| - '**/*.md' | ||
| push: | ||
| branches: | ||
| - bugfix-2.1.x | ||
| paths-ignore: | ||
| - config/** | ||
| - data/** | ||
| - docs/** | ||
| - '**/*.md' | ||
|
|
||
| jobs: | ||
| test_builds: | ||
| name: Run All Tests | ||
| if: github.repository == 'MarlinFirmware/Marlin' | ||
|
|
||
| runs-on: ubuntu-latest | ||
|
|
||
| strategy: | ||
| matrix: | ||
| test-platform: | ||
|
|
||
| # Native | ||
| - linux_native | ||
|
|
||
| # AVR | ||
| - mega2560 | ||
| - mega1280 | ||
| - at90usb1286_dfu | ||
|
|
||
| # AVR Extended | ||
| - FYSETC_F6 | ||
| - melzi_optiboot | ||
| - rambo | ||
| - sanguino1284p | ||
| - sanguino644p | ||
|
|
||
| # SAM3X8E | ||
| - DUE | ||
| - DUE_archim | ||
|
|
||
| # SAMD21 | ||
| - SAMD51_grandcentral_m4 | ||
| - SAMD21_minitronics20 | ||
|
|
||
| # ESP32 | ||
| - esp32 | ||
| - mks_tinybee | ||
|
|
||
| # Teensy 2 | ||
| #- at90usb1286_cdc | ||
|
|
||
| # Teensy MK20DX256 | ||
| - teensy31 | ||
|
|
||
| # Teensy MK64FX512, MK66FX1M0 | ||
| - teensy35 | ||
|
|
||
| # Teensy IMXRT1062DVx6A | ||
| - teensy41 | ||
|
|
||
| # STM32F0 | ||
| - malyan_M300 | ||
| - STM32F070CB_malyan | ||
| - STM32F070RB_malyan | ||
|
|
||
| # STM32F1 | ||
| - chitu_f103 | ||
| - mks_robin | ||
| - mks_robin_nano_v1v2 | ||
| - PANDA_PI_V29 | ||
| - STM32F103RC_btt | ||
| - STM32F103RC_fysetc | ||
| - STM32F103RE_btt | ||
| - STM32F103RE_btt_USB | ||
| - STM32F103RE_creality | ||
| - STM32F103VE_longer | ||
| #- mks_robin_mini | ||
| #- mks_robin_nano_v1_3_f4_usbmod | ||
| #- mks_robin_nano_v1v2_usbmod | ||
| #- STM32F103CB_malyan | ||
| #- STM32F103RC_btt_USB | ||
| #- STM32F103RE | ||
|
|
||
| # STM32F4 | ||
| - ARMED | ||
| - BIGTREE_BTT002 | ||
| - BIGTREE_GTR_V1_0 | ||
| - BIGTREE_SKR_PRO | ||
| - FLYF407ZG | ||
| - FYSETC_S6 | ||
| - LERDGEK | ||
| - LERDGEX | ||
| - mks_robin_pro2 | ||
| - Opulo_Lumen_REV3 | ||
| - rumba32 | ||
| - STM32F401RC_creality | ||
| - STM32F407VE_black | ||
| - I3DBEEZ9_V1 | ||
|
|
||
| # STM32F7 | ||
| - NUCLEO_F767ZI | ||
| - REMRAM_V1 | ||
|
|
||
| # STM32H7 | ||
| - BTT_SKR_SE_BX | ||
| - STM32H743VI_btt | ||
|
|
||
| # STM32F1 (Maple) | ||
| - jgaurora_a5s_a1_maple | ||
| - mks_robin_lite_maple | ||
| - mks_robin_pro_maple | ||
| - STM32F103RC_btt_USB_maple | ||
| - STM32F103RC_fysetc_maple | ||
| - STM32F103RC_meeb_maple | ||
| - STM32F103VE_longer_maple | ||
| - STM32F103VE_ZM3E4V2_USB_maple | ||
| #- mks_robin_maple | ||
| #- mks_robin_nano_v1v2_maple | ||
| #- STM32F103RC_btt_maple | ||
| #- STM32F103RE_creality_maple | ||
|
|
||
| # STM32G0 | ||
| - STM32G0B1RE_btt | ||
|
|
||
| # LPC176x - Lengthy tests | ||
| - LPC1768 | ||
| - LPC1769 | ||
|
|
||
| steps: | ||
|
|
||
| - name: Check out the PR | ||
| uses: actions/checkout@v3 | ||
|
|
||
| - name: Cache pip | ||
| uses: actions/cache@v3 | ||
| with: | ||
| path: ~/.cache/pip | ||
| key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }} | ||
| restore-keys: | | ||
| ${{ runner.os }}-pip- | ||
| - name: Cache PlatformIO | ||
| uses: actions/cache@v3 | ||
| with: | ||
| path: ~/.platformio | ||
| key: ${{ runner.os }}-${{ hashFiles('**/lockfiles') }} | ||
|
|
||
| - name: Select Python 3.7 | ||
| uses: actions/setup-python@v3 | ||
| 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 | ||
|
|
||
| - name: Install PlatformIO | ||
| run: | | ||
| pip install -U platformio | ||
| pio upgrade --dev | ||
| pio pkg update --global | ||
| - name: Run ${{ matrix.test-platform }} Tests | ||
| run: | | ||
| make tests-single-ci TEST_TARGET=${{ matrix.test-platform }} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.