From 0fa5015774fdfbf536ede7ffa28a6804e176f21b Mon Sep 17 00:00:00 2001 From: Jose Quintana Date: Tue, 29 Jun 2021 22:35:56 +0200 Subject: [PATCH] feat: i686 targets and drop windows-msvc-arm64 temporally - i686-pc-windows-msvc - i686-unknown-linux-gnu - i686-unknown-linux-musl - x86_64-pc-windows-gnu --- .github/workflows/devel.yml | 159 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------------- 1 file changed, 98 insertions(+), 61 deletions(-) diff --git a/.github/workflows/devel.yml b/.github/workflows/devel.yml index cd62609..58cf128 100644 --- a/.github/workflows/devel.yml +++ b/.github/workflows/devel.yml @@ -7,7 +7,7 @@ on: - staging - trying schedule: - - cron: '30 01 * * *' + - cron: '30 01 * * *' # Every day at 01:30 UTC jobs: test: @@ -21,67 +21,91 @@ jobs: TARGET_DIR: ./target # Emit backtraces on panics RUST_BACKTRACE: 1 + # Skip tests + SKIP_TESTS: "" strategy: matrix: build: - - pinned - - stable - - beta - - linux-musl - - linux-musl-arm64 - - linux-gnu - - linux-gnu-arm64 - - linux-arm-gnueabihf - - macos - - macos-arm64 - - windows-msvc - - windows-msvc-arm64 + - pinned + - stable + - beta + - linux-musl + - linux-musl-arm64 + - linux-musl-i686 + - linux-gnu + - linux-gnu-arm64 + - linux-gnu-i686 + - linux-arm-gnueabihf + - macos + - macos-arm64 + - windows-msvc + - windows-msvc-i686 + - windows-pc-gnu + # - windows-msvc-arm64 include: - - build: pinned - os: ubuntu-20.04 - rust: 1.53.0 - - build: stable - os: ubuntu-20.04 - rust: stable - - build: beta - os: ubuntu-20.04 - rust: beta - - build: linux-musl - os: ubuntu-20.04 - rust: nightly - target: x86_64-unknown-linux-musl - - build: linux-musl-arm64 - os: ubuntu-20.04 - rust: nightly - target: aarch64-unknown-linux-musl - - build: linux-gnu - os: ubuntu-20.04 - rust: nightly - target: x86_64-unknown-linux-gnu - - build: linux-gnu-arm64 - os: ubuntu-20.04 - rust: nightly - target: aarch64-unknown-linux-gnu - - build: linux-arm-gnueabihf - os: ubuntu-20.04 - rust: nightly - target: arm-unknown-linux-gnueabihf - - build: macos - os: macos-latest - rust: nightly - target: x86_64-apple-darwin - - build: macos-arm64 - os: macos-latest - rust: nightly - target: aarch64-apple-darwin - - build: windows-msvc - os: windows-2019 - rust: nightly - target: x86_64-pc-windows-msvc - - build: windows-msvc-arm64 - os: windows-2019 - rust: nightly - target: aarch64-pc-windows-msvc + # Specific Rust channels + - build: pinned + os: ubuntu-20.04 + rust: 1.53.0 + - build: stable + os: ubuntu-20.04 + rust: stable + - build: beta + os: ubuntu-20.04 + rust: beta + # Our release builds are generated by a nightly compiler to take + # advantage of the latest optimizations/compile time improvements. + - build: linux-musl + os: ubuntu-20.04 + rust: nightly + target: x86_64-unknown-linux-musl + - build: linux-musl-i686 + os: ubuntu-20.04 + rust: nightly + target: i686-unknown-linux-musl + - build: linux-musl-arm64 + os: ubuntu-20.04 + rust: nightly + target: aarch64-unknown-linux-musl + - build: linux-gnu + os: ubuntu-20.04 + rust: nightly + target: x86_64-unknown-linux-gnu + - build: linux-gnu-i686 + os: ubuntu-20.04 + rust: nightly + target: i686-unknown-linux-gnu + - build: linux-gnu-arm64 + os: ubuntu-20.04 + rust: nightly + target: aarch64-unknown-linux-gnu + - build: linux-arm-gnueabihf + os: ubuntu-20.04 + rust: nightly + target: arm-unknown-linux-gnueabihf + - build: macos + os: macos-latest + rust: nightly + target: x86_64-apple-darwin + - build: macos-arm64 + os: macos-latest + rust: nightly + target: aarch64-apple-darwin + - build: windows-msvc + os: windows-2019 + rust: nightly + target: x86_64-pc-windows-msvc + - build: windows-msvc-i686 + os: windows-2019 + rust: nightly + target: i686-pc-windows-msvc + - build: windows-pc-gnu + os: windows-2019 + rust: nightly-x86_64-gnu + # - build: windows-msvc-arm64 + # os: windows-2019 + # rust: nightly + # target: aarch64-pc-windows-msvc steps: - name: Checkout repository @@ -102,9 +126,21 @@ jobs: echo "TARGET_FLAGS=--target ${{ matrix.target }}" >> $GITHUB_ENV echo "TARGET_DIR=./target/${{ matrix.target }}" >> $GITHUB_ENV + - name: Cache cargo registry and git trees + uses: Swatinem/rust-cache@v1 + + - name: Show command used for Cargo + run: | + echo "cargo command is: ${{ env.CARGO }}" + echo "target flag is: ${{ env.TARGET_FLAGS }}" + echo "target dir is: ${{ env.TARGET_DIR }}" + - name: aarch64 specific items if: matrix.build == 'macos-arm64' run: | + # Can't run tests: cross-compiling + echo "SKIP_TESTS=yes" >> $GITHUB_ENV + # Use the beta compiler sudo xcode-select -s /Applications/Xcode_12.2.app/Contents/Developer/ @@ -113,10 +149,11 @@ jobs: echo "MACOSX_DEPLOYMENT_TARGET=$(xcrun -sdk macosx11.0 --show-sdk-platform-version)" >> $GITHUB_ENV - name: Run tests - run: ${{ env.CARGO }} test --verbose + if: env.SKIP_TESTS == '' + run: ${{ env.CARGO }} test --verbose ${{ env.TARGET_FLAGS }} - - name: Build static-web-server and crates - run: ${{ env.CARGO }} build --verbose + - name: Run build + run: ${{ env.CARGO }} build --verbose ${{ env.TARGET_FLAGS }} checks: name: checks -- libgit2 1.7.2