diff --git a/.forgejo/workflows/CI.yml b/.forgejo/workflows/ci.yml similarity index 65% rename from .forgejo/workflows/CI.yml rename to .forgejo/workflows/ci.yml index e523456..2d886ec 100644 --- a/.forgejo/workflows/CI.yml +++ b/.forgejo/workflows/ci.yml @@ -17,29 +17,40 @@ jobs: steps: - uses: actions/checkout@v4 - + - name: Restore cache id: restore-cache uses: actions/cache/restore@v4 with: path: | + ~/.quicklisp-client-fix + ~/.roswell /usr/local/bin/ros /usr/local/etc/roswell/ - ~/.roswell - ~/.config/common-lisp/source-registry.conf.d - ~/lisp - .qlot/ - key: roswell-${{ runner.os }}-${{ matrix.lisp }}-${{ hashFiles('qlfile.lock', '.forgejo/workflows/CI.yml') }} + qlfile + qlfile.lock + .qlot + ~/.cache/common-lisp/ + key: roswell-${{ runner.os }}-${{ matrix.lisp }}-${{ hashFiles('qlfile', 'qlfile.lock', '*.asd', '.forgejo/workflows/ci.yml') }} - - name: Install dependencies + - name: Install Roswell if: steps.restore-cache.outputs.cache-hit != 'true' env: LISP: ${{ matrix.lisp }} run: | curl -L https://raw.githubusercontent.com/roswell/roswell/master/scripts/install-for-ci.sh | sh + + - name: Install Qlot + if: steps.restore-cache.outputs.cache-hit != 'true' + run: | ros install fukamachi/qlot + + - name: Install dependencies + if: steps.restore-cache.outputs.cache-hit != 'true' + run: | PATH="~/.roswell/bin:$PATH" qlot install + qlot exec ros install ningle-fbr - name: Save cache id: save-cache @@ -47,13 +58,15 @@ jobs: if: steps.restore-cache.outputs.cache-hit != 'true' with: path: | + ~/.quicklisp-client-fix + ~/.roswell /usr/local/bin/ros /usr/local/etc/roswell/ - ~/.roswell - ~/.config/common-lisp/source-registry.conf.d - ~/lisp - .qlot/ + qlfile + qlfile.lock + .qlot + ~/.cache/common-lisp/ key: ${{ steps.restore-cache.outputs.cache-primary-key }} - name: Run tests - run: .qlot/bin/rove ningle-fbr.asd \ No newline at end of file + run: .qlot/bin/rove ningle-fbr.asd diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 5c662f5..675ae55 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -14,18 +14,16 @@ jobs: matrix: lisp: - sbcl-bin + - ccl-bin + + env: + LISP: ${{ matrix.lisp }} steps: - uses: actions/checkout@v4 - - - 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 ningle-fbr.asd + - uses: 40ants/setup-lisp@v4 + with: + asdf-system: ningle-fbr + - uses: 40ants/run-tests@v2 + with: + asdf-system: ningle-fbr \ No newline at end of file diff --git a/qlfile.lock b/qlfile.lock index a25f779..8b51a33 100644 --- a/qlfile.lock +++ b/qlfile.lock @@ -13,7 +13,7 @@ ("cl-ppcre" . (:class qlot/source/ql:source-ql :initargs (:%version :latest) - :version "ql-2023-10-21")) + :version "ql-2023-06-18")) ("alexandria" . (:class qlot/source/ql:source-ql :initargs (:%version :latest)