From ba4102591741dc48ab0dbdb07f71fdebb62960ed Mon Sep 17 00:00:00 2001 From: TSC21 Date: Fri, 17 Apr 2020 12:19:57 +0100 Subject: [PATCH 1/8] formula: gcc-arm-none-eabi: update to use GNU Arm Embedded Toolchain Version 9 --- Formula/gcc-arm-none-eabi.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Formula/gcc-arm-none-eabi.rb b/Formula/gcc-arm-none-eabi.rb index 085bb15..2677e5e 100644 --- a/Formula/gcc-arm-none-eabi.rb +++ b/Formula/gcc-arm-none-eabi.rb @@ -3,9 +3,9 @@ class GccArmNoneEabi < Formula desc "GNU Embedded Toolchain for ARM" homepage "https://developer.arm.com/open-source/gnu-toolchain/gnu-rm/downloads" - url "https://armkeil.blob.core.windows.net/developer/Files/downloads/gnu-rm/7-2018q2/gcc-arm-none-eabi-7-2018-q2-update-mac.tar.bz2" - version "20180627" - sha256 "c1c4af5226d52bd1b688cf1bd78f60eeea53b19fb337ef1df4380d752ba88759" + url "https://developer.arm.com/-/media/Files/downloads/gnu-rm/9-2019q4/RC2.1/gcc-arm-none-eabi-9-2019-q4-major-mac.tar.bz2" + version '9-2019-q4-major' + sha256 "1249f860d4155d9c3ba8f30c19e7a88c5047923cea17e0d08e633f12408f01f0" def install ohai "Copying binaries..." From 275cfa796174d5ff198596760e372a9c8a38337e Mon Sep 17 00:00:00 2001 From: TSC21 Date: Mon, 20 Apr 2020 13:00:05 +0100 Subject: [PATCH 2/8] fix brew check and style offenses --- Formula/fastcdr.rb | 2 +- Formula/fastrtps.rb | 2 +- Formula/fastrtps15.rb | 2 +- Formula/gcc-arm-none-eabi.rb | 2 +- Formula/genromfs.rb | 2 +- Formula/kconfig-frontends.rb | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Formula/fastcdr.rb b/Formula/fastcdr.rb index c9a272c..d9ce73f 100644 --- a/Formula/fastcdr.rb +++ b/Formula/fastcdr.rb @@ -1,7 +1,7 @@ require "formula" class Fastcdr < Formula - desc "OMG RTPS / DDS implementation." + desc "OMG RTPS / DDS implementation" homepage "http://www.eprosima.com/index.php/products-all/eprosima-fast-rtps" url "https://github.com/eProsima/Fast-CDR/archive/v1.0.8.tar.gz" version "1.6.0" diff --git a/Formula/fastrtps.rb b/Formula/fastrtps.rb index ac5ca9c..ac9cd99 100644 --- a/Formula/fastrtps.rb +++ b/Formula/fastrtps.rb @@ -1,7 +1,7 @@ require "formula" class Fastrtps < Formula - desc "OMG RTPS / DDS implementation." + desc "OMG RTPS / DDS implementation" homepage "http://www.eprosima.com/index.php/products-all/eprosima-fast-rtps" url "http://px4-tools.s3.amazonaws.com/fastrtps-v1.6.0.tar.gz" sha256 "a999f30e945c2be856cc4cbed3b338646c4016e6a26e0416dc442f07f658a2b5" diff --git a/Formula/fastrtps15.rb b/Formula/fastrtps15.rb index d0fb00f..0483cf4 100644 --- a/Formula/fastrtps15.rb +++ b/Formula/fastrtps15.rb @@ -1,7 +1,7 @@ require "formula" class Fastrtps15 < Formula - desc "OMG RTPS / DDS implementation." + desc "OMG RTPS / DDS implementation" homepage "http://www.eprosima.com/index.php/products-all/eprosima-fast-rtps" url "http://px4-tools.s3.amazonaws.com/fastrtps-v1.5.0p.tar.gz" version "1.5.0" diff --git a/Formula/gcc-arm-none-eabi.rb b/Formula/gcc-arm-none-eabi.rb index 2677e5e..8c9a40a 100644 --- a/Formula/gcc-arm-none-eabi.rb +++ b/Formula/gcc-arm-none-eabi.rb @@ -4,7 +4,7 @@ class GccArmNoneEabi < Formula desc "GNU Embedded Toolchain for ARM" homepage "https://developer.arm.com/open-source/gnu-toolchain/gnu-rm/downloads" url "https://developer.arm.com/-/media/Files/downloads/gnu-rm/9-2019q4/RC2.1/gcc-arm-none-eabi-9-2019-q4-major-mac.tar.bz2" - version '9-2019-q4-major' + version "20191106" sha256 "1249f860d4155d9c3ba8f30c19e7a88c5047923cea17e0d08e633f12408f01f0" def install diff --git a/Formula/genromfs.rb b/Formula/genromfs.rb index 8cbd794..c010026 100644 --- a/Formula/genromfs.rb +++ b/Formula/genromfs.rb @@ -1,7 +1,7 @@ require "formula" class Genromfs < Formula - desc "tool for creating romfs images" + desc "Tool for creating ROMFS images" homepage "https://github.com/chexum/genromfs" url "http://px4-travis.s3.amazonaws.com/toolchain/genromfs-0.5.2.tar.gz" sha256 "30f37fc734572c1dbaa2504585bc23ba6b8fd7df767ae7155995b2ca0ebed960" diff --git a/Formula/kconfig-frontends.rb b/Formula/kconfig-frontends.rb index a756189..c682e46 100644 --- a/Formula/kconfig-frontends.rb +++ b/Formula/kconfig-frontends.rb @@ -1,7 +1,7 @@ require "formula" class KconfigFrontends < Formula - desc "kconfig frontends and parser" + desc "Kconfig frontends and parser" homepage "http://ymorin.is-a-geek.org/projects/kconfig-frontends" url "http://px4-travis.s3.amazonaws.com/toolchain/kconfig-frontends-3.7.0.0.tar.gz" sha256 "a0d9b6565cf671337d0d570da872cc3847ce0c8355f7208807121d0c2fdddea9" From a0aafc2d75068a6e918741e49629562064ade544 Mon Sep 17 00:00:00 2001 From: TSC21 Date: Mon, 20 Apr 2020 13:22:04 +0100 Subject: [PATCH 3/8] Travis: make the formulae check a mandatory stage to pass --- .travis.yml | 46 +++++++++++++++++++++++++++------------------- 1 file changed, 27 insertions(+), 19 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9df1592..51f08ba 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,15 +3,25 @@ os: osx language: generic matrix: include: - - osx_image: xcode9.4 - - osx_image: xcode10.3 - - osx_image: xcode11.3 + - name: Test formulae in macOS 10.13 (Xcode 9.4) + os: osx + osx_image: xcode9.4 + - name: Test formulae in macOS 10.14.4 (Xcode 10.3) + os: osx + osx_image: xcode10.3 + - name: Test formulae in macOS 10.14 (Xcode 11.3) + os: osx + osx_image: xcode11.3 + - name: Sanity check the formulae + os: osx + osx_image: xcode11.3 + env: + - BREW_SANITY_CHECK=ON branches: only: - master - before_cache: - brew cleanup @@ -37,18 +47,16 @@ before_install: - ulimit -n 1024 script: - # Homebrew style checks - - brew audit $(brew --repo $TRAVIS_REPO_SLUG)/Formula/*.rb - - brew style $(brew --repo $TRAVIS_REPO_SLUG)/Formula/*.rb - - # Install the toolchain and Python dependencies - - brew uninstall python@2 - - brew install px4-dev - # - brew install px4-sim - - pip3 install --user --upgrade packaging pyserial empy toml pandas jinja2 pyyaml pyros-genmsg - - # Compile PX4 firmware - - git clone -b master https://github.com/PX4/Firmware.git ~/Firmware - - cd ~/Firmware - # - DONT_RUN=1 make px4_sitl_default gazebo - - make px4_fmu-v5_default + - if [[ "$BREW_SANITY_CHECK" == "ON" ]]; then + brew audit $(brew --repo $TRAVIS_REPO_SLUG)/Formula/*.rb; + brew style $(brew --repo $TRAVIS_REPO_SLUG)/Formula/*.rb; + else + brew uninstall python@2; + # brew install px4-sim; + brew install px4-dev; + pip3 install --user --upgrade pyserial empy toml pandas jinja2 packaging pyyaml pyros-genmsg; + git clone -b master https://github.com/PX4/Firmware.git ~/Firmware; + cd ~/Firmware; + # DONT_RUN=1 make px4_sitl_default gazebo + make px4_fmu-v5_default; + fi From f8fef1e4a47a0584b4ae0258fcee0aeae22c403c Mon Sep 17 00:00:00 2001 From: TSC21 Date: Mon, 20 Apr 2020 16:48:25 +0100 Subject: [PATCH 4/8] Travis: remove macOS High Sierra from pipeline --- .travis.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 51f08ba..bbca0aa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,9 +3,6 @@ os: osx language: generic matrix: include: - - name: Test formulae in macOS 10.13 (Xcode 9.4) - os: osx - osx_image: xcode9.4 - name: Test formulae in macOS 10.14.4 (Xcode 10.3) os: osx osx_image: xcode10.3 From 3de637b2a4dca56e71df697c28a0e96f88dccc52 Mon Sep 17 00:00:00 2001 From: TSC21 Date: Mon, 20 Apr 2020 16:50:21 +0100 Subject: [PATCH 5/8] Travis: run pipeline only over macOS Mojave --- .travis.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index bbca0aa..44dc22d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,10 +3,7 @@ os: osx language: generic matrix: include: - - name: Test formulae in macOS 10.14.4 (Xcode 10.3) - os: osx - osx_image: xcode10.3 - - name: Test formulae in macOS 10.14 (Xcode 11.3) + - name: Test formulae in macOS 10.14 (Mojave) os: osx osx_image: xcode11.3 - name: Sanity check the formulae From e2881829ebfe3ca3d0862b45616f5caba11bb49d Mon Sep 17 00:00:00 2001 From: TSC21 Date: Thu, 20 Aug 2020 13:48:09 +0200 Subject: [PATCH 6/8] gcc-arm-none-eabi: udpate to version 9-2020q2 --- Formula/gcc-arm-none-eabi.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Formula/gcc-arm-none-eabi.rb b/Formula/gcc-arm-none-eabi.rb index 8c9a40a..117e5ce 100644 --- a/Formula/gcc-arm-none-eabi.rb +++ b/Formula/gcc-arm-none-eabi.rb @@ -3,7 +3,7 @@ class GccArmNoneEabi < Formula desc "GNU Embedded Toolchain for ARM" homepage "https://developer.arm.com/open-source/gnu-toolchain/gnu-rm/downloads" - url "https://developer.arm.com/-/media/Files/downloads/gnu-rm/9-2019q4/RC2.1/gcc-arm-none-eabi-9-2019-q4-major-mac.tar.bz2" + url "https://developer.arm.com/-/media/Files/downloads/gnu-rm/9-2020q2/gcc-arm-none-eabi-9-2020-q2-update-mac.tar.bz2" version "20191106" sha256 "1249f860d4155d9c3ba8f30c19e7a88c5047923cea17e0d08e633f12408f01f0" From 1316a813e4a407890d284b842afac786e8cd47a7 Mon Sep 17 00:00:00 2001 From: TSC21 Date: Thu, 20 Aug 2020 13:54:13 +0200 Subject: [PATCH 7/8] travis: add build job for MacOS Catalina --- .travis.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 44dc22d..e2b2625 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,9 +3,12 @@ os: osx language: generic matrix: include: - - name: Test formulae in macOS 10.14 (Mojave) + - name: Test formulae in MacOS 10.14 (Mojave) os: osx osx_image: xcode11.3 + - name: Test formulae in MacOS 10.15 (Catalina) + os: osx + osx_image: xcode12u - name: Sanity check the formulae os: osx osx_image: xcode11.3 From e4db08f259a6dc11c65ecf68530fd4d6996c956c Mon Sep 17 00:00:00 2001 From: TSC21 Date: Thu, 20 Aug 2020 13:57:40 +0200 Subject: [PATCH 8/8] travis: remove script comments --- .travis.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index e2b2625..05ceff8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -49,11 +49,9 @@ script: brew style $(brew --repo $TRAVIS_REPO_SLUG)/Formula/*.rb; else brew uninstall python@2; - # brew install px4-sim; brew install px4-dev; pip3 install --user --upgrade pyserial empy toml pandas jinja2 packaging pyyaml pyros-genmsg; git clone -b master https://github.com/PX4/Firmware.git ~/Firmware; cd ~/Firmware; - # DONT_RUN=1 make px4_sitl_default gazebo make px4_fmu-v5_default; fi