diff --git a/.github/bors.toml b/.github/bors.toml index 641ba2ea..c83d10e8 100644 --- a/.github/bors.toml +++ b/.github/bors.toml @@ -2,6 +2,21 @@ block_labels = ["needs-decision", "S-waiting-on-team"] delete_merged_branches = true required_approvals = 1 status = [ - "continuous-integration/travis-ci/push", + "ci-linux (stable, rustfmt, x86_64-unknown-linux-gnu, linux)", + "ci-linux (stable, Atmel, x86_64-unknown-linux-gnu, linux)", + "ci-linux (stable, Freescale, x86_64-unknown-linux-gnu, linux)", + "ci-linux (stable, Fujitsu, x86_64-unknown-linux-gnu, linux)", + "ci-linux (stable, Holtek, x86_64-unknown-linux-gnu, linux)", + "ci-linux (stable, Nordic, x86_64-unknown-linux-gnu, linux)", + "ci-linux (stable, Nuvoton, x86_64-unknown-linux-gnu, linux)", + "ci-linux (stable, NXP, x86_64-unknown-linux-gnu, linux)", + "ci-linux (stable, RISC-V, x86_64-unknown-linux-gnu, linux)", + "ci-linux (stable, SiliconLabs, x86_64-unknown-linux-gnu, linux)", + "ci-linux (stable, Spansion, x86_64-unknown-linux-gnu, linux)", + "ci-linux (stable, STMicro, x86_64-unknown-linux-gnu, linux)", + "ci-linux (stable, Toshiba, x86_64-unknown-linux-gnu, linux)", + "ci-linux (1.37.0, Nordic, x86_64-unknown-linux-gnu, linux)", + "ci-linux (stable, x86_64-apple-darwin, osx)", + "ci-linux (stable, x86_64-pc-windows-msvc, windows)", ] timeout_sec = 14400 diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml deleted file mode 100644 index bcad10ed..00000000 --- a/.gitlab-ci.yml +++ /dev/null @@ -1,18 +0,0 @@ -build:stable: - image: rust:stretch - script: - - cargo build - -build:nightly: - image: rustlang/rust:nightly - script: - - cargo build - -regress:nightly: - image: rustlang/rust:nightly - script: - - cargo build --release - - rustup component add rustfmt-preview - - cd ci/svd2rust-regress - - rm -rf ./output - - cargo run --release -- --long-test --format --verbose --nightly diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 86899df9..00000000 --- a/.travis.yml +++ /dev/null @@ -1,102 +0,0 @@ -dist: trusty -language: rust -services: docker -sudo: required - -env: - global: - - CRATE_NAME=svd2rust - - TARGET=x86_64-unknown-linux-gnu - -matrix: - allow_failures: - - rust: nightly - - include: - # rustfmt - - env: TARGET=x86_64-unknown-linux-gnu VENDOR=rustfmt - rust: stable - - # All generated code should be running on stable now - - env: TARGET=x86_64-unknown-linux-gnu VENDOR=Atmel - - - env: TARGET=x86_64-unknown-linux-gnu VENDOR=Freescale - - - env: TARGET=x86_64-unknown-linux-gnu VENDOR=Fujitsu - - - env: TARGET=x86_64-unknown-linux-gnu VENDOR=Holtek - - - env: TARGET=x86_64-unknown-linux-gnu VENDOR=Nordic - - - env: TARGET=x86_64-unknown-linux-gnu VENDOR=Nuvoton - - - env: TARGET=x86_64-unknown-linux-gnu VENDOR=NXP - - - env: TARGET=x86_64-unknown-linux-gnu VENDOR=RISC-V - - - env: TARGET=x86_64-unknown-linux-gnu VENDOR=SiliconLabs - - - env: TARGET=x86_64-unknown-linux-gnu VENDOR=Spansion - - - env: TARGET=x86_64-unknown-linux-gnu VENDOR=STMicro - - - env: TARGET=x86_64-unknown-linux-gnu VENDOR=Toshiba - - # MSRV - - env: TARGET=x86_64-unknown-linux-gnu VENDOR=Nordic - rust: 1.37.0 - - # Only works on nightly for now - - env: TARGET=x86_64-unknown-linux-gnu VENDOR=OTHER - rust: nightly - - # Stable, used to produce binary releases - # Linux; we do the MUSL builds locally and then upload the binaries - # - env: TARGET=i686-unknown-linux-gnu - # - env: TARGET=i686-unknown-linux-musl - # - env: TARGET=x86_64-unknown-linux-gnu - # - env: TARGET=x86_64-unknown-linux-musl - - # OSX - - env: TARGET=x86_64-apple-darwin - os: osx - - # Windows - - env: TARGET=x86_64-pc-windows-msvc - os: windows - rust: stable-msvc - -install: - - bash ci/install.sh - -script: - - bash ci/script.sh - -before_deploy: - - sh ci/before_deploy.sh - -deploy: - api_key: - secure: AohBNo0QBsXxxyHcmElV1lZ0TCz83ul/woA9OKOiK07fbcwMnG9XI5HFkQAj/gOdL/O6N8R7EqRjwyc39VSJ0YsX9cyKfrUWoFgTBjySFOfKTG8Fh2WRMhnJUYfocjW8QnVAkPY0KDaVMnyDzl35+Ak/QqbOKXCO6nvfYIBmEhaW6yuYJjnkNpsn3wF3VfDA7XjkMe+24oWe6AYC7aH/CM1qws5+/6kp6VJr1xTkzH+zgNwJNXWmuDWCrMDreYamDwZ4mb0xlWd22I36ZAYDZMe8vIS7Bzw3bIlp0r4li5kDmIFQD39ft7jdNmGxDMFsuSVAyZOvvjfWP4axXncJLvXS1ygCMW9XR7gy3pTg/JXzcj9rnldntHLb2vIcwsXfcy78a7O+N+F9CjrcAeLUCBO43bqrFuX1RKtqicLzEi1IZoj6qYVcVbucyrOKU1ABgnemMT+ukizKjHbK2n8YPq6REUw4kr7aLySFRtb/Y/oSruXe1Ne0/698ty4OPHA+cyYkuPP3Q+Gw+26WKWetzLum1ZwvPlHxb3sdYvE6/38n0jPL/zszZoX88K8wjTDoKZZSse+CB4iXIigV8u3wSrPsuGHwBiG2DNmeITcvmU4g6xHkhXhD4RVbdrD4XGGQuMATXN+yKDg2ggkqxqkJZ/JnL3VjoBM8SdeVdj/zwnQ= - file_glob: true - file: $CRATE_NAME-$TRAVIS_TAG-$TARGET.* - on: - condition: $TRAVIS_RUST_VERSION = stable - tags: true - provider: releases - skip_cleanup: true - -cache: cargo -before_cache: - - chmod -R a+r $HOME/.cargo - -branches: - only: - - staging - - trying - # release tags - - /^v\d+\.\d+\.\d+.*$/ - -notifications: - email: - on_success: never