From c71d67ba3f4bdedbd5ec1e931e6ea9568fcd0d98 Mon Sep 17 00:00:00 2001 From: Spaceman Date: Fri, 20 Aug 2021 18:31:26 -0400 Subject: [PATCH] [Core] [Docs] Remove travis-ci references (#13916) --- .travis.yml | 38 -------------------- docs/breaking_changes.md | 1 - docs/contributing.md | 2 +- docs/de/README.md | 1 - docs/es/README.md | 1 - docs/fr-fr/README.md | 1 - docs/fr-fr/breaking_changes.md | 1 - docs/fr-fr/contributing.md | 2 +- docs/he-il/README.md | 1 - docs/ja/README.md | 1 - docs/ja/breaking_changes.md | 1 - docs/ja/contributing.md | 2 +- docs/ja/other_vscode.md | 1 - docs/ko-kr/README.md | 1 - docs/other_vscode.md | 1 - docs/pt-br/README.md | 1 - docs/ru-ru/README.md | 1 - docs/zh-cn/README.md | 1 - readme.md | 1 - util/travis_build.sh | 40 --------------------- util/travis_compiled_push.sh | 63 ---------------------------------- util/travis_push.sh | 14 -------- util/travis_test.sh | 19 ---------- util/travis_utils.sh | 25 -------------- 24 files changed, 3 insertions(+), 217 deletions(-) delete mode 100644 .travis.yml delete mode 100755 util/travis_build.sh delete mode 100755 util/travis_compiled_push.sh delete mode 100755 util/travis_push.sh delete mode 100644 util/travis_test.sh delete mode 100755 util/travis_utils.sh diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 17f401da45c76efbd9e137e5277f92c2b97d41b3..0000000000000000000000000000000000000000 --- a/.travis.yml +++ /dev/null @@ -1,38 +0,0 @@ -os: linux -dist: trusty -group: edge -language: c -branches: - except: - - /^.*-automated-build$/ - - /^[0-9]+\.[0-9]+\.[0-9]+/ -env: - global: - - secure: vBTSL34BDPxDilKUuTXqU4CJ26Pv5hogD2nghatkxSQkI1/jbdnLj/DQdPUrMJFDIY6TK3AltsBx72MaMsLQ1JO/Ou24IeHINHXzUC1FlS9yQa48cpxnhX5kzXNyGs3oa0qaFbvnr7RgYRWtmD52n4bIZuSuW+xpBv05x2OCizdT2ZonH33nATaHGFasxROm4qYZ241VfzcUv766V6RVHgL4x9V08warugs+RENVkfzxxwhk3NmkrISabze0gSVJLHBPHxroZC6EUcf/ocobcuDrCwFqtEt90i7pNIAFUE7gZsN2uE75LmpzAWin21G7lLPcPL2k4FJVd8an1HiP2WmscJU6U89fOfMb2viObnKcCzebozBCmKGtHEuXZo9FcReOx49AnQSpmESJGs+q2dL/FApkTjQiyT4J6O5dJpoww0/r57Wx0cmmqjETKBb5rSgXM51Etk3wO09mvcPHsEwrT7qH8r9XWdyCDoEn7FCLX3/LYnf/D4SmZ633YPl5gv3v9XEwxR5+04akjgnvWDSNIaDbWBdxHNb7l4pMc+WR1bwCyMyA7KXj0RrftEGOrm9ZRLe6BkbT4cycA+j77nbPOMcyZChliV9pPQos+4TOJoTzcK2L8yWVoY409aDNVuAjdP6Yum0R2maBGl/etLmIMpJC35C5/lZ+dUNjJAM= - - MAKEFLAGS="-j3 --output-sync" -services: - - docker -addons: - apt: - sources: - - ubuntu-toolchain-r-test - - llvm-toolchain-trusty-7 - packages: - - diffutils - - clang-format-7 - - libstdc++-7-dev -script: - - git fetch --depth=50 origin $TRAVIS_BRANCH:$TRAVIS_BRANCH - - git rev-parse --short HEAD - - git diff --name-only HEAD $TRAVIS_BRANCH - - bash util/travis_test.sh - - bash util/travis_build.sh -after_script: - bash util/travis_compiled_push.sh -notifications: - webhooks: - urls: - - https://webhooks.gitter.im/e/afce403d65f143dfac09 - on_success: always # options: [always|never|change] default: always - on_failure: always # options: [always|never|change] default: always - on_start: never # options: [always|never|change] default: always diff --git a/docs/breaking_changes.md b/docs/breaking_changes.md index b0d56a81bd29b7b51310862ad9f6617d8d0c80eb..754e6ec97d937f24c97f906b885e6268af42bae6 100644 --- a/docs/breaking_changes.md +++ b/docs/breaking_changes.md @@ -93,7 +93,6 @@ This happens immediately after the previous `develop` branch is merged. * [ ] `git push upstream develop` * GitHub Actions * [ ] Create a PR for `develop` - * [ ] Make sure travis comes back clean * [ ] **Turn off 'Automatically delete head branches' for the repository** -- confirm with @qmk/directors that it is done before continuing * `qmk_firmware` git commands * [ ] `git checkout master` diff --git a/docs/contributing.md b/docs/contributing.md index fe48619e4180650b6c6585bea67105ac32b887d7..1d68d22d9f0e3821a79046f8916caba2d306f0a0 100644 --- a/docs/contributing.md +++ b/docs/contributing.md @@ -148,7 +148,7 @@ Feature and Bug Fix PR's affect all keyboards. We are also in the process of res Here are some things to keep in mind when working on your feature or bug fix. * **Disabled by default** - memory is a pretty limited on most chips QMK supports, and it's important that current keymaps aren't broken, so please allow your feature to be turned **on**, rather than being turned off. If you think it should be on by default, or reduces the size of the code, please talk with us about it. -* **Compile locally before submitting** - hopefully this one is obvious, but things need to compile! Our Travis system will catch any issues, but it's generally faster for you to compile a few keyboards locally instead of waiting for the results to come back. +* **Compile locally before submitting** - hopefully this one is obvious, but things need to compile! You should always make sure your changes compile before opening a pull request. * **Consider revisions and different chip-bases** - there are several keyboards that have revisions that allow for slightly different configurations, and even different chip-bases. Try to make a feature supported in ARM and AVR, or automatically disabled on platforms it doesn't work on. * **Explain your feature** - Document it in `docs/`, either as a new file or as part of an existing file. If you don't document it other people won't be able to benefit from your hard work. diff --git a/docs/de/README.md b/docs/de/README.md index 5de496a201f48d51ab905bfb2eb571d42eeac18d..f5f35d9d1c0db8a970b2b35cddb33434a4bd669b 100644 --- a/docs/de/README.md +++ b/docs/de/README.md @@ -1,7 +1,6 @@ # Quantum Mechanical Keyboard Firmware [![Aktuelle Version](https://img.shields.io/github/tag/qmk/qmk_firmware.svg)](https://github.com/qmk/qmk_firmware/tags) -[![Build Status](https://travis-ci.org/qmk/qmk_firmware.svg?branch=master)](https://travis-ci.org/qmk/qmk_firmware) [![Discord](https://img.shields.io/discord/440868230475677696.svg)](https://discord.gg/Uq7gcHh) [![Docs Status](https://img.shields.io/badge/docs-ready-orange.svg)](https://docs.qmk.fm) [![GitHub contributors](https://img.shields.io/github/contributors/qmk/qmk_firmware.svg)](https://github.com/qmk/qmk_firmware/pulse/monthly) diff --git a/docs/es/README.md b/docs/es/README.md index be063ad7c01841a7eb6037888b8fb6070e15b95f..0d504fad05d2b7e14474ce19c2fcf239a33840fb 100644 --- a/docs/es/README.md +++ b/docs/es/README.md @@ -1,7 +1,6 @@ # Firmware Quantum Mechanical Keyboard [![Versión actual](https://img.shields.io/github/tag/qmk/qmk_firmware.svg)](https://github.com/qmk/qmk_firmware/tags) -[![Estado de Build](https://travis-ci.org/qmk/qmk_firmware.svg?branch=master)](https://travis-ci.org/qmk/qmk_firmware) [![Discord](https://img.shields.io/discord/440868230475677696.svg)](https://discord.gg/Uq7gcHh) [![Estado de la documentación](https://img.shields.io/badge/docs-ready-orange.svg)](https://docs.qmk.fm) [![Contribuyentes en GitHub](https://img.shields.io/github/contributors/qmk/qmk_firmware.svg)](https://github.com/qmk/qmk_firmware/pulse/monthly) diff --git a/docs/fr-fr/README.md b/docs/fr-fr/README.md index dfb9dcda4e941214577ad647fa21a3bf3ed2c6f1..3d1f740abb9abf680a859c07a9b478f901de73ca 100644 --- a/docs/fr-fr/README.md +++ b/docs/fr-fr/README.md @@ -1,7 +1,6 @@ # Quantum Mechanical Keyboard Firmware [![Version courante](https://img.shields.io/github/tag/qmk/qmk_firmware.svg)](https://github.com/qmk/qmk_firmware/tags) -[![Statut du build](https://travis-ci.org/qmk/qmk_firmware.svg?branch=master)](https://travis-ci.org/qmk/qmk_firmware) [![Discord](https://img.shields.io/discord/440868230475677696.svg)](https://discord.gg/Uq7gcHh) [![Statut de la doc](https://img.shields.io/badge/docs-ready-orange.svg)](https://docs.qmk.fm) [![Contributeurs GitHub](https://img.shields.io/github/contributors/qmk/qmk_firmware.svg)](https://github.com/qmk/qmk_firmware/pulse/monthly) diff --git a/docs/fr-fr/breaking_changes.md b/docs/fr-fr/breaking_changes.md index 2dbb26e5a5bce6111e6341833929d38ac49127cb..4c3817d2ef66676405bf50dfff99642495a53c68 100644 --- a/docs/fr-fr/breaking_changes.md +++ b/docs/fr-fr/breaking_changes.md @@ -103,5 +103,4 @@ Ceci est fait immédiatement après la fusion de la branche `future` précédent * [ ] `git push origin future` * Actions sur GitHub * [ ] Crée un PR pour `future` - * [ ] S'assurer que Travis ne relève aucun problème * [ ] Fusion le PR `future` diff --git a/docs/fr-fr/contributing.md b/docs/fr-fr/contributing.md index 58931cf1f63fdc648b6e1567352e550d7dbe3f10..d13587105542294bb8ce4b85fd815a14bd0c8872 100644 --- a/docs/fr-fr/contributing.md +++ b/docs/fr-fr/contributing.md @@ -134,7 +134,7 @@ Les PR de nouvelles fonctionnalités de de correction de bug affectent tous les Voici quelques choses à garder en tête lorsque vous travaillez sur une fonctionnalité ou un bug fix. * **Désactivé par défaut** - la mémoire est plutôt limitée sur la plupart des puces que QMK supporte, et il est important que les keymaps courantes ne soient pas cassées. S'il vous plaît faites que vos features doivent être **activées** plutôt que désactivées. Si vous pensez qu'elle devrait être activée par défaut, ou que cela réduit la taille du code, parlez-nous-en. -* **Compilez localement avant de soumettre** - Cela devrait aller sans dire, mais votre code doit compiler! Notre système Travis devrait relever les problèmes, mais il est généralement plus rapide de compiler quelques claviers en local plutôt que d'attendre le retour des résultats +* **Compilez localement avant de soumettre** - Cela devrait aller sans dire, mais votre code doit compiler! Vous devriez toujours faire gaffe à ce que vos changements compilent avant d'ouvrir une pull request. * **Faites attention aux révisions et différentes bases de puces** - beaucoup de claviers ont des révisions qui permettent des changements de configuration mineurs, voir des bases de chip différentes. Essayez de faire que votre fonctionnalité soit supportée à la fois sur ARM et AVR, ou désactivez-là automatiquement sur les plateformes non supportées. * **Expliquez votre fonctionnalité** - Documentez-là dans `docs/`, soit dans un nouveau fichier, ou dans une partie d'un fichier existant. Si vous ne la documentez pas, personne ne pourra bénéficier de votre dur labeur. diff --git a/docs/he-il/README.md b/docs/he-il/README.md index 3b0ff146185fdfaaa7733fdf3405c870f0b20fbc..5c113eb498dfb4acc5d96373225e783711300b8b 100644 --- a/docs/he-il/README.md +++ b/docs/he-il/README.md @@ -2,7 +2,6 @@ # קושחה עבור Quantum Mechanical Keyboard [![גירסה נוכחית](https://img.shields.io/github/tag/qmk/qmk_firmware.svg)](https://github.com/qmk/qmk_firmware/tags) -[![מצב הבניה](https://travis-ci.org/qmk/qmk_firmware.svg?branch=master)](https://travis-ci.org/qmk/qmk_firmware) [![ערוץ דיסקורד](https://img.shields.io/discord/440868230475677696.svg)](https://discord.gg/Uq7gcHh) [![מצב מסמכים](https://img.shields.io/badge/docs-ready-orange.svg)](https://docs.qmk.fm) [![תומכי GitHub](https://img.shields.io/github/contributors/qmk/qmk_firmware.svg)](https://github.com/qmk/qmk_firmware/pulse/monthly) diff --git a/docs/ja/README.md b/docs/ja/README.md index c02a14b487ce36d575032bc72facac05241635af..aefacbc414aa469224c490bfd5f0357732cbcdfc 100644 --- a/docs/ja/README.md +++ b/docs/ja/README.md @@ -6,7 +6,6 @@ --> [![現在のバージョン](https://img.shields.io/github/tag/qmk/qmk_firmware.svg)](https://github.com/qmk/qmk_firmware/tags) -[![ビルド状態](https://travis-ci.org/qmk/qmk_firmware.svg?branch=master)](https://travis-ci.org/qmk/qmk_firmware) [![Discord](https://img.shields.io/discord/440868230475677696.svg)](https://discord.gg/Uq7gcHh) [![ドキュメントの状態](https://img.shields.io/badge/docs-ready-orange.svg)](https://docs.qmk.fm) [![GitHub 貢献者](https://img.shields.io/github/contributors/qmk/qmk_firmware.svg)](https://github.com/qmk/qmk_firmware/pulse/monthly) diff --git a/docs/ja/breaking_changes.md b/docs/ja/breaking_changes.md index 0f7256e684d684557cddd3f0ae37c5c308aaf1e0..35f5837897330ae053c2527263f9b99f02b954b5 100644 --- a/docs/ja/breaking_changes.md +++ b/docs/ja/breaking_changes.md @@ -117,5 +117,4 @@ git push --force * [ ] `git push origin develop` * GitHub Actions * [ ] `develop`の PR を作成します - * [ ] travis がクリーンに戻ったことを確認します * [ ] `develop` PR をマージします diff --git a/docs/ja/contributing.md b/docs/ja/contributing.md index cafdda21bce4ecab389f78ccb561275deea1a2cc..14ef598ea91008fcb8c2db591a60fa986359f2de 100644 --- a/docs/ja/contributing.md +++ b/docs/ja/contributing.md @@ -153,7 +153,7 @@ enum my_keycodes { 機能やバグの修正に取り組む時に留意すべき幾つかの事があります。 * **デフォルトで無効** - QMK がサポートするほとんどのチップでメモリがかなり制限されており、現在のキーマップが壊れていないことが重要です。ですので、あなたの機能をオフにするのではなく**オン**にするようにしてください。デフォルトでオンにすべき場合、あるいはコードのサイズを小さくする必要がある場合は、相談してください。 -* **サブミットする前にローカルでコンパイル** - これが明白であることを願っていますが、コンパイルする必要があります。私たちの Travis システムは全ての問題をキャッチしますが、結果が返ってくるのを待つ代わりに幾つかのキーボードをローカルでコンパイルする方が一般的に速いです。 +* **サブミットする前にローカルでコンパイル** - これが明白であることを願っていますが、コンパイルする必要があります。プルリクエストを作成する前に、変更した内容がコンパイルできるかどうかを常に確認する必要があります。 * **リビジョンと異なるチップベースを考慮** - 僅かに異なる設定、さらには異なるチップベースを可能にするリビジョンを持つキーボードが幾つかあります。ARM および AVR でサポートされる機能を作成する、あるいは動作しないプラットフォームでは自動的に無効化するようにしてください。 * **機能の説明** - 新しいファイルあるいは既存のファイルの一部として、`docs/` の中に文章化します。文章化しないと、他の人はあなたの苦労から利益を得ることができません。 diff --git a/docs/ja/other_vscode.md b/docs/ja/other_vscode.md index 906d6626daef902278eec6de8b184134290a06d3..9250e16276bd48e7da09e995a44f16d9ea1c526b 100644 --- a/docs/ja/other_vscode.md +++ b/docs/ja/other_vscode.md @@ -110,7 +110,6 @@ VS Code のようなフル機能のエディタの使用は、プレーンテキ * [GitHub Markdown Preview](https://marketplace.visualstudio.com/items?itemName=bierner.github-markdown-preview) - _[オプション]_ - VS Code の markdown プレビューを GithHub のようにします。 * [VS Live Share Extension Pack](https://marketplace.visualstudio.com/items?itemName=MS-vsliveshare.vsliveshare-pack) - _[オプション]_ - この拡張により、他の誰かがあなたのワークスペースにアクセスし(あるいは、あなたが他の誰かのワークスペースにアクセスし)、手伝うことができます。あなたが問題を抱えており、他の誰かの助けが必要な場合に便利です。 * [VIM Keymap](https://marketplace.visualstudio.com/items?itemName=GiuseppeCesarano.vim-keymap) - _[オプション]_ - VIM スタイルのキーバインドを好む人向け。これには他のオプションもあります。 -* [Travis CI Status](https://marketplace.visualstudio.com/items?itemName=felixrieseberg.vsc-travis-ci-status) - _[オプション]_ - セットアップした場合、現在の Travis CI の状態を表示します。 いずれかの拡張機能をインストールしたら、再起動します。 diff --git a/docs/ko-kr/README.md b/docs/ko-kr/README.md index 82e2be96187c4818dfea7cb3ed1389a8bc25139f..a3b5b91011179e718310e5b8b6719ad57e61bd63 100644 --- a/docs/ko-kr/README.md +++ b/docs/ko-kr/README.md @@ -1,7 +1,6 @@ # Quantum Mechanical Keyboard Firmware [![Current Version](https://img.shields.io/github/tag/qmk/qmk_firmware.svg)](https://github.com/qmk/qmk_firmware/tags) -[![Build Status](https://travis-ci.org/qmk/qmk_firmware.svg?branch=master)](https://travis-ci.org/qmk/qmk_firmware) [![Discord](https://img.shields.io/discord/440868230475677696.svg)](https://discord.gg/Uq7gcHh) [![Docs Status](https://img.shields.io/badge/docs-ready-orange.svg)](https://docs.qmk.fm) [![GitHub contributors](https://img.shields.io/github/contributors/qmk/qmk_firmware.svg)](https://github.com/qmk/qmk_firmware/pulse/monthly) diff --git a/docs/other_vscode.md b/docs/other_vscode.md index 2de3c8cb453d4478cf5cd7b0a515608551fd1b61..6af0a6f7b409a33b731b342d2bdb78593b967161 100644 --- a/docs/other_vscode.md +++ b/docs/other_vscode.md @@ -108,7 +108,6 @@ This installs a bunch of Git related tools that may make using Git with QMK Firm * [GitHub Markdown Preview](https://marketplace.visualstudio.com/items?itemName=bierner.github-markdown-preview) - _[Optional]_ - Makes the markdown preview in VS Code more like GitHub's. * [VS Live Share Extension Pack](https://marketplace.visualstudio.com/items?itemName=MS-vsliveshare.vsliveshare-pack) - _[Optional]_ - This extension allows somebody else to access your workspace (or you to access somebody else's workspace) and help out. This is great if you're having issues and need some help from somebody. * [VIM Keymap](https://marketplace.visualstudio.com/items?itemName=GiuseppeCesarano.vim-keymap) - _[Optional]_ - For those that prefer VIM style keybindings. There are other options for this, too. -* [Travis CI Status](https://marketplace.visualstudio.com/items?itemName=felixrieseberg.vsc-travis-ci-status) - _[Optional]_ - This shows the current Travis CI status, if you have it set up. Restart once you've installed any extensions diff --git a/docs/pt-br/README.md b/docs/pt-br/README.md index a8ba93f33a8e1c2ea4d99d76074c5ea966901e56..bf8ec974eb97e251c2bd88df551aec344ed830b3 100644 --- a/docs/pt-br/README.md +++ b/docs/pt-br/README.md @@ -1,7 +1,6 @@ # Quantum Mechanical Keyboard Firmware [![Current Version](https://img.shields.io/github/tag/qmk/qmk_firmware.svg)](https://github.com/qmk/qmk_firmware/tags) -[![Build Status](https://travis-ci.org/qmk/qmk_firmware.svg?branch=master)](https://travis-ci.org/qmk/qmk_firmware) [![Discord](https://img.shields.io/discord/440868230475677696.svg)](https://discord.gg/Uq7gcHh) [![Docs Status](https://img.shields.io/badge/docs-ready-orange.svg)](https://docs.qmk.fm) [![GitHub contributors](https://img.shields.io/github/contributors/qmk/qmk_firmware.svg)](https://github.com/qmk/qmk_firmware/pulse/monthly) diff --git a/docs/ru-ru/README.md b/docs/ru-ru/README.md index d3c28fa44043ef8d81f6d9c3426b3bf5af65ca90..7218781540ec254b5c1a9264b010858ff739ea27 100644 --- a/docs/ru-ru/README.md +++ b/docs/ru-ru/README.md @@ -1,7 +1,6 @@ # Quantum Mechanical Keyboard Firmware [![Current Version](https://img.shields.io/github/tag/qmk/qmk_firmware.svg)](https://github.com/qmk/qmk_firmware/tags) -[![Build Status](https://travis-ci.org/qmk/qmk_firmware.svg?branch=master)](https://travis-ci.org/qmk/qmk_firmware) [![Discord](https://img.shields.io/discord/440868230475677696.svg)](https://discord.gg/Uq7gcHh) [![Docs Status](https://img.shields.io/badge/docs-ready-orange.svg)](https://docs.qmk.fm) [![GitHub contributors](https://img.shields.io/github/contributors/qmk/qmk_firmware.svg)](https://github.com/qmk/qmk_firmware/pulse/monthly) diff --git a/docs/zh-cn/README.md b/docs/zh-cn/README.md index 560b0a8ee69cd8c7ed11a30086181b80bc44fc94..b42818d582f2f781ee9d02132123d53bf2dac976 100644 --- a/docs/zh-cn/README.md +++ b/docs/zh-cn/README.md @@ -1,7 +1,6 @@ # QMK机械键盘固件 [![当前版本](https://img.shields.io/github/tag/qmk/qmk_firmware.svg)](https://github.com/qmk/qmk_firmware/tags) -[![开发状态](https://travis-ci.org/qmk/qmk_firmware.svg?branch=master)](https://travis-ci.org/qmk/qmk_firmware) [![异议](https://img.shields.io/discord/440868230475677696.svg)](https://discord.gg/Uq7gcHh) [![文档状态](https://img.shields.io/badge/docs-ready-orange.svg)](https://docs.qmk.fm) [![GitHub贡献者](https://img.shields.io/github/contributors/qmk/qmk_firmware.svg)](https://github.com/qmk/qmk_firmware/pulse/monthly) diff --git a/readme.md b/readme.md index 6092f209be1a05e3683e04e12bb391776b799a13..5649ddfa097aba055adf91148f471bfe27b5982f 100644 --- a/readme.md +++ b/readme.md @@ -1,7 +1,6 @@ # Quantum Mechanical Keyboard Firmware [![Current Version](https://img.shields.io/github/tag/qmk/qmk_firmware.svg)](https://github.com/qmk/qmk_firmware/tags) -[![Build Status](https://travis-ci.org/qmk/qmk_firmware.svg?branch=master)](https://travis-ci.org/qmk/qmk_firmware) [![Discord](https://img.shields.io/discord/440868230475677696.svg)](https://discord.gg/Uq7gcHh) [![Docs Status](https://img.shields.io/badge/docs-ready-orange.svg)](https://docs.qmk.fm) [![GitHub contributors](https://img.shields.io/github/contributors/qmk/qmk_firmware.svg)](https://github.com/qmk/qmk_firmware/pulse/monthly) diff --git a/util/travis_build.sh b/util/travis_build.sh deleted file mode 100755 index a96cfcb57529dc3979c4e709416a509d126d1e4b..0000000000000000000000000000000000000000 --- a/util/travis_build.sh +++ /dev/null @@ -1,40 +0,0 @@ -#!/usr/bin/env bash - -source util/travis_utils.sh - -if [[ "$TRAVIS_COMMIT_MESSAGE" == *"[skip build]"* ]]; then - echo "Skipping due to commit message" - exit 0 -fi - -if [ "$LOCAL_BRANCH" == "master" ] || [ "$NUM_CORE_CHANGES" != "0" ]; then - echo "Making default keymaps for all keyboards" - make all:default - exit $? -fi - -exit_code=0 - -for KB in $(make list-keyboards); do - KEYBOARD_CHANGES=$(echo "$QMK_CHANGES" | grep -E '^(keyboards/'${KB}'/)') - if [[ -z "$KEYBOARD_CHANGES" ]]; then - # skip as no changes for this keyboard - continue - fi - - KEYMAP_ONLY=$(echo "$KEYBOARD_CHANGES" | grep -cv /keymaps/) - if [[ $KEYMAP_ONLY -gt 0 ]]; then - echo "Making all keymaps for $KB" - make ${KB}:all - : $((exit_code = $exit_code + $?)) - else - CHANGED_KEYMAPS=$(echo "$KEYBOARD_CHANGES" | grep -oP '(?<=keyboards/'${KB}'/keymaps/)([a-zA-Z0-9_-]+)(?=\/)') - for KM in $CHANGED_KEYMAPS ; do - echo "Making $KM for $KB" - make ${KB}:${KM} - : $((exit_code = $exit_code + $?)) - done - fi -done - -exit $exit_code diff --git a/util/travis_compiled_push.sh b/util/travis_compiled_push.sh deleted file mode 100755 index 73a9e3bc484020491242c058a6bf90280f2d69d3..0000000000000000000000000000000000000000 --- a/util/travis_compiled_push.sh +++ /dev/null @@ -1,63 +0,0 @@ -#!/usr/bin/env bash - -source util/travis_utils.sh -source util/travis_push.sh - -set -o errexit -o nounset - -rev=$(git rev-parse --short HEAD) -echo "Using git hash ${rev}" - -if [[ "$TRAVIS_BRANCH" == "master" && "$TRAVIS_PULL_REQUEST" == "false" ]] ; then - -git checkout master - -git diff --name-only -n 1 ${TRAVIS_COMMIT_RANGE} - -if [[ "$TRAVIS_COMMIT_MESSAGE" != *"[skip build]"* ]] ; then - make generate-keyboards-file SILENT=true > .keyboards - cd .. - git clone git@github.com:qmk/qmk.fm.git - cd qmk.fm - mv ../qmk_firmware/id_rsa_qmk.fm id_rsa_qmk.fm - mv ../qmk_firmware/.keyboards . - ssh-add -D - eval `ssh-agent -s` - ssh-add id_rsa_qmk.fm - - # don't delete files in case not all keyboards are built - # rm -f compiled/*.hex - - # ignore errors here - # In theory, this is more flexible, and will allow for additional expansion of additional types of files and other names - mv ../qmk_firmware/*_default.*{hex,bin} ./compiled/ || true - - # get the list of keyboards - readarray -t keyboards < .keyboards - - # replace / with _ - keyboards=("${keyboards[@]//[\/]/_}") - - # remove all binaries that don't belong to a keyboard in .keyboards - for file in "./compiled"/* ; do - match=0 - for keyboard in "${keyboards[@]}" ; do - if [[ ${file##*/} = "${keyboard}_default.bin" ]] || [[ ${file##*/} = "${keyboard}_default.hex" ]]; then - match=1 - break - fi - done - if [[ $match = 0 ]]; then - echo "Removing deprecated binary: $file" - rm "$file" - fi - done - - bash _util/generate_keyboard_page.sh - git add -A - git commit -m "generated from qmk/qmk_firmware@${rev}" - git push git@github.com:qmk/qmk.fm.git - -fi - -fi diff --git a/util/travis_push.sh b/util/travis_push.sh deleted file mode 100755 index 7f7d4c2c647deaa67be7c9e9df8cd2db7fd96ebf..0000000000000000000000000000000000000000 --- a/util/travis_push.sh +++ /dev/null @@ -1,14 +0,0 @@ -# Use this by sourcing it in your script. - -if [[ "$TRAVIS_BRANCH" == "master" && "$TRAVIS_PULL_REQUEST" == "false" ]] ; then - git config --global user.name "QMK Bot" - git config --global user.email "hello@qmk.fm" - - openssl aes-256-cbc -K $encrypted_b0ee987fd0fc_key -iv $encrypted_b0ee987fd0fc_iv -in secrets.tar.enc -out secrets.tar -d - tar xvf secrets.tar - - chmod 600 id_rsa_qmk_firmware - chmod 600 id_rsa_qmk.fm - eval `ssh-agent -s` - ssh-add id_rsa_qmk_firmware -fi diff --git a/util/travis_test.sh b/util/travis_test.sh deleted file mode 100644 index 9156147ca6066195c4411b5bae4dee3cf3f32976..0000000000000000000000000000000000000000 --- a/util/travis_test.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/usr/bin/env bash - -source util/travis_utils.sh - -if [[ "$TRAVIS_COMMIT_MESSAGE" == *"[skip test]"* ]]; then - echo "Skipping due to commit message" - exit 0 -fi - -exit_code=0 - -if [ "$LOCAL_BRANCH" == "master" ] || [ "$NUM_CORE_CHANGES" != "0" ]; then - echo "Running tests." - make test:all - : $((exit_code = $exit_code + $?)) - -fi - -exit $exit_code diff --git a/util/travis_utils.sh b/util/travis_utils.sh deleted file mode 100755 index e949946e222bcab7540277c2ac7789a8758ccc03..0000000000000000000000000000000000000000 --- a/util/travis_utils.sh +++ /dev/null @@ -1,25 +0,0 @@ -# Use this by sourcing it in your script. - -# Provide sane defaults for travis environment -TRAVIS_BRANCH="${TRAVIS_BRANCH:master}" -TRAVIS_PULL_REQUEST="${TRAVIS_PULL_REQUEST:false}" -TRAVIS_COMMIT_MESSAGE="${TRAVIS_COMMIT_MESSAGE:-none}" -TRAVIS_COMMIT_RANGE="${TRAVIS_COMMIT_RANGE:-HEAD~1..HEAD}" - -# test force push -#TRAVIS_COMMIT_RANGE="c287f1bfc5c8...81f62atc4c1d" - -# Extra variables -LOCAL_BRANCH=$(git rev-parse --abbrev-ref HEAD) -QMK_CHANGES=$(git diff --name-only -n 1 ${TRAVIS_COMMIT_RANGE}) -NUM_CORE_CHANGES=$(echo "$QMK_CHANGES" | grep -Ec -e '^Makefile' -e '^[^/]*.mk' -e '^drivers/' -e '^lib/atsam' -e '^lib/lib8tion/' -e '^platforms' -e '^quantum' -e '^tests' -e '^tmk_core') - -# if docker is installed - patch calls to within the qmk docker image -if command -v docker >/dev/null; then - function make() { - docker run --rm -e MAKEFLAGS="$MAKEFLAGS" -w /qmk_firmware/ -v "$PWD":/qmk_firmware --user $(id -u):$(id -g) qmkfm/base_container make "$@" - } - function qmk() { - docker run --rm -w /qmk_firmware/ -v "$PWD":/qmk_firmware --user $(id -u):$(id -g) qmkfm/base_container bin/qmk "$@" - } -fi