From b77d13dfce4e0ce3a8fb8f373c1b10bf18bcf9de Mon Sep 17 00:00:00 2001 From: paku Date: Sun, 12 Jan 2025 01:27:21 +0900 Subject: [PATCH] Improve CI workflow --- .forgejo/workflows/CI.yml | 4 ++-- .github/workflows/CI.yml | 23 +++++++++++++---------- 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/.forgejo/workflows/CI.yml b/.forgejo/workflows/CI.yml index aba6751..de59be4 100644 --- a/.forgejo/workflows/CI.yml +++ b/.forgejo/workflows/CI.yml @@ -29,7 +29,7 @@ jobs: ~/.config/common-lisp/source-registry.conf.d ~/lisp .qlot/ - key: roswell-${{ runner.os }}-${{ matrix.lisp }}-${{ hashFiles('qlfile.lock') }} + key: roswell-${{ runner.os }}-${{ matrix.lisp }}-${{ hashFiles('qlfile.lock', '.forgejo/workflows/CI.yml') }} - name: Install dependencies if: steps.restore-cache.outputs.cache-hit != 'true' @@ -56,4 +56,4 @@ jobs: key: ${{ steps.restore-cache.outputs.cache-primary-key }} - name: Run tests - run: .qlot/bin/rove lack-mw.asd \ No newline at end of file + run: .qlot/bin/rove lack-mw.asd diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 0d608b0..293cd8a 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -7,7 +7,7 @@ on: pull_request: jobs: - tests: + test: runs-on: ubuntu-latest strategy: @@ -15,14 +15,17 @@ jobs: lisp: - sbcl-bin - env: - LISP: ${{ matrix.lisp }} - steps: - uses: actions/checkout@v4 - - uses: 40ants/setup-lisp@v4 - with: - asdf-system: lack-mw - - uses: 40ants/run-tests@v2 - with: - asdf-system: lack-mw + + - name: Install dependencies + env: + LISP: ${{ matrix.lisp }} + run: | + curl -L https://raw.githubusercontent.com/roswell/roswell/master/scripts/install-for-ci.sh | sh + ros install fukamachi/qlot + PATH="~/.roswell/bin:$PATH" + qlot install + + - name: Run tests + run: .qlot/bin/rove lack-mw.asd