From d5f81a827d87d6dac9595dcce2849db8797ee592 Mon Sep 17 00:00:00 2001 From: Christopher Serr Date: Fri, 24 Aug 2018 03:44:55 +0200 Subject: [PATCH] Add Continuous Integration --- .cargo/config | 4 ++ .travis.yml | 120 +++++++++++++++++++++++++++++++++++++++++++ Cargo.toml | 2 +- appveyor.yml | 75 +++++++++++++++++++++++++++ ci/before_deploy.ps1 | 23 +++++++++ ci/before_deploy.sh | 47 +++++++++++++++++ ci/install.sh | 47 +++++++++++++++++ ci/script.sh | 23 +++++++++ 8 files changed, 340 insertions(+), 1 deletion(-) create mode 100644 .cargo/config create mode 100644 .travis.yml create mode 100644 appveyor.yml create mode 100644 ci/before_deploy.ps1 create mode 100644 ci/before_deploy.sh create mode 100644 ci/install.sh create mode 100644 ci/script.sh diff --git a/.cargo/config b/.cargo/config new file mode 100644 index 0000000..7992fef --- /dev/null +++ b/.cargo/config @@ -0,0 +1,4 @@ +[target.x86_64-unknown-linux-gnu] +rustflags = [ + "-C", "link-arg=-Wl,-rpath,$ORIGIN", +] diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..4628f8c --- /dev/null +++ b/.travis.yml @@ -0,0 +1,120 @@ +# Based on the "trust" template v0.1.2 +# https://github.com/japaric/trust/tree/v0.1.2 + +dist: trusty +language: rust +services: docker +# sudo: required + +env: + global: + - CRATE_NAME=romhack-patcher + +matrix: + include: + # Android + # - env: TARGET=aarch64-linux-android DISABLE_TESTS=1 + # - env: TARGET=arm-linux-androideabi DISABLE_TESTS=1 + # - env: TARGET=armv7-linux-androideabi DISABLE_TESTS=1 + # - env: TARGET=i686-linux-android DISABLE_TESTS=1 + # - env: TARGET=x86_64-linux-android DISABLE_TESTS=1 + + # iOS + # - env: TARGET=aarch64-apple-ios DISABLE_TESTS=1 + # os: osx + # - env: TARGET=armv7-apple-ios DISABLE_TESTS=1 + # os: osx + # - env: TARGET=armv7s-apple-ios DISABLE_TESTS=1 + # os: osx + # - env: TARGET=i386-apple-ios DISABLE_TESTS=1 + # os: osx + # - env: TARGET=x86_64-apple-ios DISABLE_TESTS=1 + # os: osx + + # Linux + # - env: TARGET=aarch64-unknown-linux-gnu + # - env: TARGET=arm-unknown-linux-gnueabi + # - env: TARGET=armv7-unknown-linux-gnueabihf + # - env: TARGET=i686-unknown-linux-gnu + # - env: TARGET=i686-unknown-linux-musl + # - env: TARGET=mips-unknown-linux-gnu + # - env: TARGET=mips64-unknown-linux-gnuabi64 + # - env: TARGET=mips64el-unknown-linux-gnuabi64 + # - env: TARGET=mipsel-unknown-linux-gnu + # - env: TARGET=powerpc-unknown-linux-gnu + # - env: TARGET=powerpc64-unknown-linux-gnu + # - env: TARGET=powerpc64le-unknown-linux-gnu + # - env: TARGET=s390x-unknown-linux-gnu DISABLE_TESTS=1 + - env: TARGET=x86_64-unknown-linux-gnu + # - env: TARGET=x86_64-unknown-linux-musl + + # OSX + # - env: TARGET=i686-apple-darwin + # os: osx + - env: TARGET=x86_64-apple-darwin + os: osx + + # *BSD + # - env: TARGET=i686-unknown-freebsd DISABLE_TESTS=1 + # - env: TARGET=x86_64-unknown-freebsd DISABLE_TESTS=1 + # - env: TARGET=x86_64-unknown-netbsd DISABLE_TESTS=1 + + # Windows + # - env: TARGET=x86_64-pc-windows-gnu + + # Bare metal + # These targets don't support std and as such are likely not suitable for + # most crates. + # - env: TARGET=thumbv6m-none-eabi + # - env: TARGET=thumbv7em-none-eabi + # - env: TARGET=thumbv7em-none-eabihf + # - env: TARGET=thumbv7m-none-eabi + + # Testing other channels + - env: TARGET=x86_64-unknown-linux-gnu + rust: nightly + - env: TARGET=x86_64-apple-darwin + os: osx + rust: nightly + +before_install: + - set -e + - rustup self update + +install: + - sh ci/install.sh + - source ~/.cargo/env || true + +script: + - bash ci/script.sh + +after_script: set +e + +before_deploy: + - sh ci/before_deploy.sh + +deploy: + api_key: + secure: vdUKCVs9QlIottGhkYhlLcGKrvmgTDYTrj/i3LvAaI/OuUfhqkMlYy/NymWBY0Abf2A7DqUKtj+ZfwM4Lw6Xrpqaf3vffL0eVSoy9RcTFzxhw5XJpHcrNVpbsAYx+IKc8lI+jGGRtygTUHEXSNwNi4g7oMmm8zu3s8HT308H2FjJU7qKDyjedZS6BFiSiUq3yFHsmGf43XR6q4JB2bUJDeyynqnVlyNHU93HraXvSSmiY+/2YTrPGMTSvS7AtbewN8L2MucUIlK6rdXxNLwcYyASOnK1UbwTj5oqhdrb5gV2nNNq9ZQ7SIq/3viqJw8FI9Uqbamt5/drRPPmr0hu7t5NzKJi0siyF0UwzNGm7Q6Wrodei7WsKtYznNr2g0U5WQTFXCgbB4hx52c/6fQ69pBWWyfCApM7YhK/sn2C2qsYKu7ZKUBwlpNYQxL2QaJOUN0F5gl6G56HritBpUx+2iVkkBI+CrXGGkbFSXOpSJsLVhnDi7DPQ83sSDtY5N0uFCLPMYNGAW/HBPUrqQuZJY55B6emneK0MkQIkBgo6bNoZHqeLUbcXZI7LQgqHoy3EcaJ+a1HpyitdiSuGUkj5CFUblPQroK8El7JvI7ULY16RAOivLU5sJtZCCZMRnZN/h56tpHOgb7bH/VRabeDhjewY4Tnn1H2DvT1pmBlH1Q= + 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: + # Travis can't cache files that are not readable by "others" + - chmod -R a+r $HOME/.cargo + +# branches: +# only: +# # release tags +# - /^v\d+\.\d+\.\d+.*$/ +# - master + +notifications: + email: + on_success: never diff --git a/Cargo.toml b/Cargo.toml index 6cdbbd9..ce27433 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -17,5 +17,5 @@ panic = "abort" lto = true [patch.crates-io] -miniz_oxide_c_api = { git = "https://github.com/Frommi/miniz_oxide" } +miniz_oxide_c_api = { git = "https://github.com/CryZe/miniz_oxide", rev = "b1eade664441a89c77a4b594d9d979170b1c9da9" } flate2 = { git = "https://github.com/eminence/flate2-rs", rev = "be78c5a693a275452c71c7d26d369332629e8fb7" } diff --git a/appveyor.yml b/appveyor.yml new file mode 100644 index 0000000..c60c39e --- /dev/null +++ b/appveyor.yml @@ -0,0 +1,75 @@ +# Based on the "trust" template v0.1.2 +# https://github.com/japaric/trust/tree/v0.1.2 + +environment: + global: + RUST_VERSION: stable + CRATE_NAME: romhack-patcher + + matrix: + # MinGW + # - TARGET: i686-pc-windows-gnu + # - TARGET: x86_64-pc-windows-gnu + + # MSVC + - TARGET: i686-pc-windows-msvc + - TARGET: x86_64-pc-windows-msvc + + # Testing other channels + # - TARGET: x86_64-pc-windows-gnu + # RUST_VERSION: nightly + - TARGET: i686-pc-windows-msvc + RUST_VERSION: nightly + - TARGET: x86_64-pc-windows-msvc + RUST_VERSION: nightly + +install: + - ps: >- + If ($Env:TARGET -eq 'x86_64-pc-windows-gnu') { + $Env:PATH += ';C:\msys64\mingw64\bin' + } ElseIf ($Env:TARGET -eq 'i686-pc-windows-gnu') { + $Env:PATH += ';C:\msys64\mingw32\bin' + } + - curl -sSf -o rustup-init.exe https://win.rustup.rs/ + - rustup-init.exe -y --default-host %TARGET% --default-toolchain %RUST_VERSION% + - set PATH=%PATH%;C:\Users\appveyor\.cargo\bin + - rustc -Vv + - cargo -V + +test_script: + # we don't run the "test phase" when doing deploys + - if [%APPVEYOR_REPO_TAG%]==[false] ( + cargo build -p romhack-patcher --target %TARGET% --release + ) + +before_deploy: + - cargo clean + - cargo build -p romhack-patcher --target %TARGET% --release + - ps: ci\before_deploy.ps1 + +deploy: + artifact: /.*\.zip/ + auth_token: + secure: ltqmI2XvM/EsWT7b/tN72fp0mEL/3o6FuqeUQcfT4y8LXcTb2LENCk/s1/g1Rt/c + description: '' + on: + RUST_VERSION: stable + appveyor_repo_tag: true + provider: GitHub + +cache: + - C:\Users\appveyor\.cargo\registry + - target + +# branches: +# only: +# # Release tags +# - /^v\d+\.\d+\.\d+.*$/ +# - master + +notifications: + - provider: Email + on_build_success: false + +# Building is done in the test phase, so we disable Appveyor's build phase. +build: false diff --git a/ci/before_deploy.ps1 b/ci/before_deploy.ps1 new file mode 100644 index 0000000..d6bc0dc --- /dev/null +++ b/ci/before_deploy.ps1 @@ -0,0 +1,23 @@ +# This script takes care of packaging the build artifacts that will go in the +# release zipfile + +$SRC_DIR = $PWD.Path +$STAGE = [System.Guid]::NewGuid().ToString() + +Set-Location $ENV:Temp +New-Item -Type Directory -Name $STAGE +Set-Location $STAGE + +$ZIP = "$SRC_DIR\$($Env:CRATE_NAME)-$($Env:APPVEYOR_REPO_TAG_NAME)-$($Env:TARGET).zip" + +Copy-Item "$SRC_DIR\target\$($Env:TARGET)\release\romhack-patcher.exe" '.\' +Get-ChildItem -Path "$SRC_DIR\target\$($Env:TARGET)\release\build" "libui.dll" -Recurse | Select -ExpandProperty FullName | Copy-Item -Destination '.\' + +7z a "$ZIP" * + +Push-AppveyorArtifact "$ZIP" + +Remove-Item *.* -Force +Set-Location .. +Remove-Item $STAGE +Set-Location $SRC_DIR diff --git a/ci/before_deploy.sh b/ci/before_deploy.sh new file mode 100644 index 0000000..e53ee44 --- /dev/null +++ b/ci/before_deploy.sh @@ -0,0 +1,47 @@ +# This script takes care of building your crate and packaging it for release + +set -ex + +main() { + cat > Cross.toml < Cross.toml <