From 33a710cf3019415badb3baf132dd6bfb01602e4e Mon Sep 17 00:00:00 2001 From: Axel Heider Date: Thu, 31 Mar 2022 20:37:50 +0200 Subject: [PATCH] testing github CI Signed-off-by: Axel Heider --- .github/workflows/compilation-checks.yml | 10 +++------- .github/workflows/pr.yml | 13 +++---------- .github/workflows/preprocess-deploy.yml | 2 +- .github/workflows/sel4test-deploy.yml | 9 ++------- .github/workflows/sel4test-sim.yml | 11 +++-------- 5 files changed, 12 insertions(+), 33 deletions(-) diff --git a/.github/workflows/compilation-checks.yml b/.github/workflows/compilation-checks.yml index a39fee6c10c..36af61707c6 100644 --- a/.github/workflows/compilation-checks.yml +++ b/.github/workflows/compilation-checks.yml @@ -19,15 +19,11 @@ jobs: strategy: fail-fast: false matrix: - arch: [ARM, ARM_HYP, AARCH64, RISCV64, X64] - compiler: [gcc, llvm] - exclude: - # llvm RISCV64 compilation is not currently supported - - arch: RISCV64 - compiler: llvm + arch: [RISCV64] + compiler: [gcc] steps: - uses: actions/checkout@v2 - - uses: seL4/ci-actions/standalone-kernel@master + - uses: hensoldt-cyber/ci-actions/standalone-kernel@patch-axel-6a with: ARCH: ${{ matrix.arch }} COMPILER: ${{ matrix.compiler }} diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index ee341dac1b7..3dba0cd5661 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -39,17 +39,10 @@ jobs: strategy: fail-fast: false matrix: - arch: [ARM, ARM_HYP, AARCH64, RISCV64, X64] - feature: ["", MCS] - exclude: - - arch: ARM_HYP - feature: MCS - - arch: AARCH64 - feature: MCS - - arch: X64 - feature: MCS + arch: [RISCV64] + feature: [""] steps: - - uses: seL4/ci-actions/preprocess@master + - uses: hensoldt-cyber/ci-actions/preprocess@patch-axel-6a with: L4V_ARCH: ${{ matrix.arch }} L4V_FEATURES: ${{ matrix.feature }} diff --git a/.github/workflows/preprocess-deploy.yml b/.github/workflows/preprocess-deploy.yml index c1057ba566f..ad75cde3bce 100644 --- a/.github/workflows/preprocess-deploy.yml +++ b/.github/workflows/preprocess-deploy.yml @@ -30,7 +30,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - arch: [ARM, ARM_HYP, AARCH64, RISCV64, X64] + arch: [RISCV64] # no MCS here, auto-updating mcs.xml should be a separate job. steps: - uses: seL4/ci-actions/preprocess@master diff --git a/.github/workflows/sel4test-deploy.yml b/.github/workflows/sel4test-deploy.yml index a391231f9b8..369d0f5cae4 100644 --- a/.github/workflows/sel4test-deploy.yml +++ b/.github/workflows/sel4test-deploy.yml @@ -38,13 +38,8 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - march: [armv7a, armv8a, nehalem, rv32imac, rv64imac] - compiler: [gcc, clang] - exclude: - - march: rv32imac - compiler: clang - - march: rv64imac - compiler: clang + march: [rv64imac] + compiler: [gcc] steps: - uses: seL4/ci-actions/sel4test-sim@master with: diff --git a/.github/workflows/sel4test-sim.yml b/.github/workflows/sel4test-sim.yml index b5edbe10935..89668445c4a 100644 --- a/.github/workflows/sel4test-sim.yml +++ b/.github/workflows/sel4test-sim.yml @@ -21,15 +21,10 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - march: [armv7a, armv8a, nehalem, rv32imac, rv64imac] - compiler: [gcc, clang] - exclude: - - march: rv32imac - compiler: clang - - march: rv64imac - compiler: clang + march: [rv64imac] + compiler: [gcc] steps: - - uses: seL4/ci-actions/sel4test-sim@master + - uses: hensoldt-cyber/ci-actions/sel4test-sim@patch-axel-6a with: march: ${{ matrix.march }} compiler: ${{ matrix.compiler }}