From 8c2a352eb7c6f78406c21e7c2212e0e23ade470f Mon Sep 17 00:00:00 2001 From: Seiya Nuta Date: Sun, 7 Nov 2021 22:29:41 +0900 Subject: [PATCH 1/5] Update --- .github/workflows/ci.yml | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ad173a3d..d08f6515 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,7 +13,17 @@ jobs: fail-fast: false matrix: include: + # Release builds. - os: ubuntu-20.04 + build_options: RELEASE=1 + - os: macos-latest + build_options: RELEASE=1 + + # Debug builds. + - os: ubuntu-20.04 + build_options: + - os: macos-latest + build_options: steps: - uses: actions/checkout@v2 @@ -22,9 +32,6 @@ jobs: with: python-version: 3.9 - - name: Docker - run: docker ps - - name: Set up Rust run: | rustup override set nightly @@ -34,21 +41,26 @@ jobs: run: cargo install cargo-binutils rustfilt - name: Build Kerla - run: make RELEASE=1 + run: make ${{ matrix.build_options }} - name: Lint run: make strict-lint - name: Install QEMU run: sudo apt-get update && sudo apt-get install -y qemu-system + if: matrix.os == 'ubuntu-20.04' + + - name: Install QEMU + run: brew install qemu + if: matrix.os == 'macos-latest' - name: Run unit tests - run: make test RELEASE=1 + run: make test ${{ matrix.build_options }} - name: Run integration tests run: > make run - RELEASE=1 + ${{ matrix.build_options }} INIT_SCRIPT="TESTS_DIR=/integration_tests /integration_tests/run.sh; halt -f" DISABLE_AUTO_CR_PRINT=1 | tee run.log From 820184157563aefdb6209a9ac8775574a68c428b Mon Sep 17 00:00:00 2001 From: Seiya Nuta Date: Sun, 7 Nov 2021 22:33:25 +0900 Subject: [PATCH 2/5] Update --- .github/workflows/ci.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d08f6515..4bb9eda1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -40,6 +40,10 @@ jobs: - name: Install cargo crates run: cargo install cargo-binutils rustfilt + - name: Install Docker + run: brew install docker + if: matrix.os == 'macos-latest' + - name: Build Kerla run: make ${{ matrix.build_options }} From f2dc529cff703d051b4fa0d570cc892073216258 Mon Sep 17 00:00:00 2001 From: Seiya Nuta Date: Sun, 7 Nov 2021 22:49:27 +0900 Subject: [PATCH 3/5] Update --- .github/workflows/ci.yml | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4bb9eda1..18d4c33d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,14 +16,10 @@ jobs: # Release builds. - os: ubuntu-20.04 build_options: RELEASE=1 - - os: macos-latest - build_options: RELEASE=1 - # Debug builds. + # Debug builds. - os: ubuntu-20.04 build_options: - - os: macos-latest - build_options: steps: - uses: actions/checkout@v2 @@ -40,10 +36,6 @@ jobs: - name: Install cargo crates run: cargo install cargo-binutils rustfilt - - name: Install Docker - run: brew install docker - if: matrix.os == 'macos-latest' - - name: Build Kerla run: make ${{ matrix.build_options }} @@ -52,11 +44,6 @@ jobs: - name: Install QEMU run: sudo apt-get update && sudo apt-get install -y qemu-system - if: matrix.os == 'ubuntu-20.04' - - - name: Install QEMU - run: brew install qemu - if: matrix.os == 'macos-latest' - name: Run unit tests run: make test ${{ matrix.build_options }} From 7664c127919ec53b1a73a89ba53edf7d708338d6 Mon Sep 17 00:00:00 2001 From: Seiya Nuta Date: Sun, 7 Nov 2021 22:50:45 +0900 Subject: [PATCH 4/5] Update --- .github/workflows/ci.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 18d4c33d..30fda47c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -3,8 +3,6 @@ name: CI on: push: branches: "*" - pull_request: - branches: "*" jobs: build_and_test: From 0a167cbcc00c9fd82c70746ee95d37b4a75cc6b0 Mon Sep 17 00:00:00 2001 From: Seiya Nuta Date: Sun, 7 Nov 2021 23:02:19 +0900 Subject: [PATCH 5/5] Update --- .github/workflows/ci.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 30fda47c..10862502 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -21,6 +21,16 @@ jobs: steps: - uses: actions/checkout@v2 + - name: Cache files + uses: actions/cache@v2 + with: + path: | + ~/.cargo + target + build + key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }} + restore-keys: ${{ runner.os }}-cargo- + - name: Set up Python uses: actions/setup-python@v2 with: