From 08ec099091862b78020594152200aed6aa3a3315 Mon Sep 17 00:00:00 2001 From: umarcor Date: Tue, 1 Dec 2020 04:24:51 +0100 Subject: [PATCH] ci/win: merge 'build.sh' into workflow --- .github/build.sh | 15 --------------- .github/workflows/test.yml | 10 ++++++++-- 2 files changed, 8 insertions(+), 17 deletions(-) delete mode 100755 .github/build.sh diff --git a/.github/build.sh b/.github/build.sh deleted file mode 100755 index 00e8b5336..000000000 --- a/.github/build.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/usr/bin/env bash - -wrap_task() { - echo "::group::$@" - "$@" - echo '::endgroup::' -} - -wrap_task ./autoconf.sh -wrap_task ./configure -wrap_task make install - -which iverilog - -wrap_task make check diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index bfe3fe93a..8ee1902fe 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -62,8 +62,14 @@ jobs: mingw-w64-x86_64-toolchain update: true - - name: Build - run: ./.github/build.sh + - name: Build, install and check + run: | + wrap() { echo "::group::$@"; "$@"; echo '::endgroup::'; } + wrap ./autoconf.sh + wrap ./configure + wrap make install + which iverilog + wrap make check - name: Test run: ./.github/test.sh