From 8e91fb978b0f7fbd264dd59f56a24afb8363e9fb Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Fri, 19 Jan 2024 08:28:35 +0100 Subject: [PATCH] Remove Travis checks Github actions work well and no need for additional travis check. --- .github/travis/cmake-build.sh | 10 ------ .github/travis/cmake-lang.sh | 12 ------- .github/travis/cmake-test.sh | 8 ----- .github/travis/legacy-build.sh | 34 -------------------- .travis.yml | 55 -------------------------------- build.sh | 58 ---------------------------------- 6 files changed, 177 deletions(-) delete mode 100755 .github/travis/cmake-build.sh delete mode 100755 .github/travis/cmake-lang.sh delete mode 100755 .github/travis/cmake-test.sh delete mode 100755 .github/travis/legacy-build.sh delete mode 100644 .travis.yml delete mode 100755 build.sh diff --git a/.github/travis/cmake-build.sh b/.github/travis/cmake-build.sh deleted file mode 100755 index 734e03d74..000000000 --- a/.github/travis/cmake-build.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh -set -xe -rm -rf build -mkdir build -cd build -cmake .. \ - -DCMAKE_TOOLCHAIN_FILE="../cmake/AvrGcc.cmake" \ - -DCMAKE_BUILD_TYPE=Release \ - -G Ninja -ninja ALL_FIRMWARE diff --git a/.github/travis/cmake-lang.sh b/.github/travis/cmake-lang.sh deleted file mode 100755 index 38404d53b..000000000 --- a/.github/travis/cmake-lang.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh -set -xe -rm -rf build -mkdir build -cd build -cmake .. \ - -DCMAKE_TOOLCHAIN_FILE="../cmake/AvrGcc.cmake" \ - -DCMAKE_BUILD_TYPE=Release \ - -G Ninja - -# ignore all failures in order to show as much output as possible -ninja -k0 check_lang || true diff --git a/.github/travis/cmake-test.sh b/.github/travis/cmake-test.sh deleted file mode 100755 index ec41633b3..000000000 --- a/.github/travis/cmake-test.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh -set -xe -rm -rf build -mkdir build -cd build -cmake .. -G Ninja -ninja tests -ctest diff --git a/.github/travis/legacy-build.sh b/.github/travis/legacy-build.sh deleted file mode 100755 index 8679f0a4a..000000000 --- a/.github/travis/legacy-build.sh +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/sh -set -xe -cp Firmware/variants/MK3S.h Firmware/Configuration_prusa.h -bash -x build.sh || { echo "MK3S variant failed" && false; } -bash -x build.sh EN_FARM || { echo "MK3S EN_FARM failed" && false; } -rm Firmware/Configuration_prusa.h -cp Firmware/variants/MK3.h Firmware/Configuration_prusa.h -bash -x build.sh || { echo "MK3 variant failed" && false; } -bash -x build.sh EN_FARM || { echo "MK3 EN_FARM failed" && false; } -rm Firmware/Configuration_prusa.h -cp Firmware/variants/MK25S-RAMBo13a.h Firmware/Configuration_prusa.h -bash -x build.sh || { echo "MK25S-RAMBo13a variant failed" && false; } -rm Firmware/Configuration_prusa.h -cp Firmware/variants/MK25S-RAMBo10a.h Firmware/Configuration_prusa.h -bash -x build.sh || { echo "MK25S-RAMBo10a variant failed" && false; } -rm Firmware/Configuration_prusa.h -cp Firmware/variants/MK25-RAMBo13a.h Firmware/Configuration_prusa.h -bash -x build.sh || { echo "MK25-RAMBo13a variant failed" && false; } -rm Firmware/Configuration_prusa.h -cp Firmware/variants/MK25-RAMBo10a.h Firmware/Configuration_prusa.h -bash -x build.sh || { echo "MK25-RAMBo10a variant failed" && false; } -rm Firmware/Configuration_prusa.h -cp Firmware/variants/MK3S-E3DREVO.h Firmware/Configuration_prusa.h -bash -x build.sh || { echo "MK3S-E3DREVO variant failed" && false; } -rm Firmware/Configuration_prusa.h -cp Firmware/variants/MK3-E3DREVO.h Firmware/Configuration_prusa.h -bash -x build.sh || { echo "MK3-E3DREVO variant failed" && false; } -rm Firmware/Configuration_prusa.h -cp Firmware/variants/MK3S-E3DREVO_HF_60W.h Firmware/Configuration_prusa.h -bash -x build.sh || { echo "MK3S-E3DREVO_HF_60W variant failed" && false; } -rm Firmware/Configuration_prusa.h -cp Firmware/variants/MK3-E3DREVO_HF_60W.h Firmware/Configuration_prusa.h -bash -x build.sh || { echo "MK3-E3DREVO_HF_60W variant failed" && false; } -rm Firmware/Configuration_prusa.h diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 768584a49..000000000 --- a/.travis.yml +++ /dev/null @@ -1,55 +0,0 @@ -dist: focal -language: minimal - -cache: - directories: - # cmake project dependencies - - .dependencies/ - # legacy PF-build dependencies - - ./../PF-build-env/ - -before_install: - # Prepare the dependencies for the old build environment - - sudo apt-get install -y python3-polib python3-pyelftools python3-regex - - # Undo whatever *GARBAGE* travis is doing with python and restore the system version - - mkdir -p .dependencies/python3 - - ln -sf /usr/bin/python3 .dependencies/python3/python3 - - PATH=$PWD/.dependencies/python3:$PATH - - # Bootstrap cmake/ninja for the new build environment - - ./utils/bootstrap.py - - PATH=$(./utils/bootstrap.py --print-dependency-directory "cmake")/bin:$PATH - - PATH=$(./utils/bootstrap.py --print-dependency-directory "ninja"):$PATH - - # Arduino IDE adds a lot of noise caused by network traffic, firewall it off - - sudo iptables -P INPUT DROP - - sudo iptables -P FORWARD DROP - - sudo iptables -P OUTPUT ACCEPT - - sudo iptables -A INPUT -i lo -j ACCEPT - - sudo iptables -A OUTPUT -o lo -j ACCEPT - - sudo iptables -A INPUT -m conntrack --ctstate ESTABLISHED,RELATED -j ACCEPT - -jobs: - include: - # legacy build.sh environment - - stage: legacy - script: ./.github/travis/legacy-build.sh - - # cmake-based build - - stage: cmake - script: ./.github/travis/cmake-build.sh - - # cmake tests - - stage: tests - script: ./.github/travis/cmake-test.sh - - # language checks - - stage: lang - script: ./.github/travis/cmake-lang.sh - -stages: - - cmake - - lang - - legacy - - tests diff --git a/build.sh b/build.sh deleted file mode 100755 index 856c80361..000000000 --- a/build.sh +++ /dev/null @@ -1,58 +0,0 @@ -#!/bin/bash -echo "***************************************************" -echo "WARNING: build.sh will be removed soon, do not use!" -echo "Switch your build to cmake or use PF-build.sh " -echo "***************************************************" - -BUILD_ENV="1.0.8" -SCRIPT_PATH="$( cd "$(dirname "$0")" ; pwd -P )" -LANGUAGES=$1 - -if [ ! -d "build-env" ]; then - mkdir build-env || exit 1 -fi -cd build-env || exit 2 - -if [ ! -d "../../PF-build-env/$BUILD_ENV-build" ]; then - if [ ! -f "PF-build-env-Linux64-$BUILD_ENV.zip" ]; then - #wget https://github.com/3d-gussner/PF-build-env-1/releases/download/$BUILD_ENV-Linux64/PF-build-env-Linux64-$BUILD_ENV.zip || exit 3 - wget https://github.com/prusa3d/PF-build-env/releases/download/$BUILD_ENV-Linux64/PF-build-env-Linux64-$BUILD_ENV.zip || exit 3 - fi - unzip -q PF-build-env-Linux64-$BUILD_ENV.zip -d ../../PF-build-env/$BUILD_ENV-build || exit 4 -fi - -cd ../../PF-build-env/$BUILD_ENV-build || exit 5 -BUILD_ENV_PATH="$( pwd -P )" - -cd .. - -if [ ! -d "Prusa-Firmware-build" ]; then - mkdir Prusa-Firmware-build || exit 6 -fi - -cd Prusa-Firmware-build || exit 7 -BUILD_PATH="$( pwd -P )" - -if [ ! -f "$SCRIPT_PATH/Firmware/Configuration_prusa.h" ]; then - cp $SCRIPT_PATH/Firmware/variants/MK3.h $SCRIPT_PATH/Firmware/Configuration_prusa.h || exit 8 -fi - -if [[ ! -z $LANGUAGES && $LANGUAGES == "EN_FARM" ]]; then - echo "English only language firmware will be built" - sed -i -- "s/^#define LANG_MODE *1/#define LANG_MODE 0/g" $SCRIPT_PATH/Firmware/config.h -else - sed -i -- "s/^#define LANG_MODE *0/#define LANG_MODE 1/g" $SCRIPT_PATH/Firmware/config.h -fi - -$BUILD_ENV_PATH/arduino $SCRIPT_PATH/Firmware/Firmware.ino --verify --board PrusaResearch:avr:prusa_einsy_rambo --pref build.path=$BUILD_PATH --pref compiler.warning_level=all || exit 9 - -export ARDUINO=$BUILD_ENV_PATH -export OUTDIR=$BUILD_PATH - -if [ -z $LANGUAGES ]; then - cd $SCRIPT_PATH/lang - ./fw-build.sh || exit 10 -fi - -#Reset lang_mode -sed -i -- "s/^#define LANG_MODE *0/#define LANG_MODE 1/g" $SCRIPT_PATH/Firmware/config.h