From 0ede24ebad547298bf5414380fa82fb2062c1b11 Mon Sep 17 00:00:00 2001 From: Axel Heider Date: Thu, 11 Jan 2024 17:42:40 +0100 Subject: [PATCH 1/5] do simulation and HW build with LLVM on RISCV Signed-off-by: Axel Heider --- .github/workflows/sel4test-hw.yml | 6 ++---- .github/workflows/sel4test-sim.yml | 5 ----- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/.github/workflows/sel4test-hw.yml b/.github/workflows/sel4test-hw.yml index af102b5bd..c8d96906d 100644 --- a/.github/workflows/sel4test-hw.yml +++ b/.github/workflows/sel4test-hw.yml @@ -33,11 +33,9 @@ jobs: strategy: fail-fast: false matrix: - march: [armv7a, armv8a, nehalem] + # There is no "rv32imac" hardware yet. + march: [armv7a, armv8a, nehalem, rv64imac] compiler: [gcc, clang] - include: - - march: rv64imac - compiler: gcc steps: - name: Build uses: seL4/ci-actions/sel4test-hw@master diff --git a/.github/workflows/sel4test-sim.yml b/.github/workflows/sel4test-sim.yml index 65c4ffbb0..194661929 100644 --- a/.github/workflows/sel4test-sim.yml +++ b/.github/workflows/sel4test-sim.yml @@ -21,11 +21,6 @@ jobs: matrix: march: [armv7a, armv8a, nehalem, rv32imac, rv64imac] compiler: [gcc, clang] - exclude: - - march: rv32imac - compiler: clang - - march: rv64imac - compiler: clang steps: - uses: seL4/ci-actions/sel4test-sim@master with: From 5a0472c024c53fc4c4819a35db1eec708e0070c2 Mon Sep 17 00:00:00 2001 From: Gerwin Klein Date: Sun, 28 Jan 2024 11:51:10 +1100 Subject: [PATCH 2/5] github: retire pr-queue action This is the last pace this action was still running. Signed-off-by: Gerwin Klein --- .github/workflows/prqueue.yml | 21 --------------------- 1 file changed, 21 deletions(-) delete mode 100644 .github/workflows/prqueue.yml diff --git a/.github/workflows/prqueue.yml b/.github/workflows/prqueue.yml deleted file mode 100644 index 58992e061..000000000 --- a/.github/workflows/prqueue.yml +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright 2021, Data61, CSIRO (ABN 41 687 119 230) -# -# SPDX-License-Identifier: BSD-2-Clause - -# Queue next PR on pushes to master -name: PR Queue - -on: - push: - branches: - - master - workflow_dispatch: {} - -jobs: - notify: - name: Notify PR candidate - runs-on: ubuntu-latest - steps: - - uses: seL4/ci-actions/pr-queue@master - with: - github_token: ${{ secrets.GITHUB_TOKEN }} From b8d0d3adce864e41c7102ac6514abc846fdbe9c3 Mon Sep 17 00:00:00 2001 From: Axel Heider Date: Wed, 31 Jan 2024 20:27:54 +0100 Subject: [PATCH 3/5] libutils: fix style Signed-off-by: Axel Heider --- libutils/include/utils/auto.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libutils/include/utils/auto.h b/libutils/include/utils/auto.h index 768e77af2..12296d2ab 100644 --- a/libutils/include/utils/auto.h +++ b/libutils/include/utils/auto.h @@ -19,8 +19,10 @@ * // no need to call free(x) * } */ -static inline void autofree_(void *p) { - void **q = (void**)p; +static inline void autofree_(void *p) +{ + void **q = (void **)p; free(*q); } + #define AUTOFREE __attribute__((cleanup(autofree_))) From 9df2d1049dd12e8cd69982845aca43ffe750841d Mon Sep 17 00:00:00 2001 From: Axel Heider Date: Wed, 31 Jan 2024 20:22:20 +0100 Subject: [PATCH 4/5] libutils: use proper macro name in comment Signed-off-by: Axel Heider --- libutils/include/utils/auto.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libutils/include/utils/auto.h b/libutils/include/utils/auto.h index 12296d2ab..12f67afdc 100644 --- a/libutils/include/utils/auto.h +++ b/libutils/include/utils/auto.h @@ -15,7 +15,7 @@ * adjacent macro. Sample usage: * * void foo(void) { - * autofree int *x = malloc(sizeof(int)); + * AUTOFREE int *x = malloc(sizeof(int)); * // no need to call free(x) * } */ From b67281aeb4dc590d31d668d29b7e7bfb2cd86e22 Mon Sep 17 00:00:00 2001 From: Gerwin Klein Date: Wed, 7 Feb 2024 16:10:33 +1100 Subject: [PATCH 5/5] github: bump actions to node20 GitHub has started issuing warnings for node16 actions. Signed-off-by: Gerwin Klein --- .github/workflows/sel4test-hw.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/sel4test-hw.yml b/.github/workflows/sel4test-hw.yml index c8d96906d..5b9e100d6 100644 --- a/.github/workflows/sel4test-hw.yml +++ b/.github/workflows/sel4test-hw.yml @@ -44,7 +44,7 @@ jobs: compiler: ${{ matrix.compiler }} sha: ${{ github.event.pull_request.head.sha }} - name: Upload images - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: images-${{ matrix.march }}-${{ matrix.compiler }} path: '*-images.tar.gz' @@ -76,13 +76,13 @@ jobs: matrix: ${{ fromJson(needs.the_matrix.outputs.matrix) }} steps: - name: Get machine queue - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: repository: seL4/machine_queue path: machine_queue token: ${{ secrets.PRIV_REPO_TOKEN }} - name: Download image - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: images-${{ matrix.march }}-${{ matrix.compiler }} - name: Run