From 0728cb22fa4f6fc6917da3dd87db467bba97efe9 Mon Sep 17 00:00:00 2001 From: Ed L Date: Sat, 15 Jul 2023 14:14:55 -0700 Subject: [PATCH 1/7] fix: reorder definitions --- data-lens.asd | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/data-lens.asd b/data-lens.asd index edb81e3..3422c0b 100644 --- a/data-lens.asd +++ b/data-lens.asd @@ -32,14 +32,6 @@ :components ((:module "t" :components ((:file "lens"))))) -(asdf:defsystem #:data-lens/beta/transducers - :description #.(format nil "~@{~a~^ ~}" - "A collection of transducers to reduce stream-manipulation overhead") - :author "Edward Langley " - :license "Apache v2" - :depends-on (:data-lens/transducers) - :in-order-to ((test-op (test-op :data-lens/transducers)))) - (asdf:defsystem #:data-lens/transducers :description #.(format nil "~@{~a~^ ~}" "A collection of transducers to reduce stream-manipulation overhead") @@ -55,6 +47,14 @@ (:file "transducers") (:file "lazy-sequence"))) +(asdf:defsystem #:data-lens/beta/transducers + :description #.(format nil "~@{~a~^ ~}" + "A collection of transducers to reduce stream-manipulation overhead") + :author "Edward Langley " + :license "Apache v2" + :depends-on (:data-lens/transducers) + :in-order-to ((test-op (test-op :data-lens/transducers)))) + (asdf:defsystem #:data-lens/transducers/test :description "tests for the transducers" :author "Edward Langley " From eb928fce45cd0f7fd317e8d9f8b745b68cbc5ee8 Mon Sep 17 00:00:00 2001 From: Ed L Date: Sat, 15 Jul 2023 14:20:23 -0700 Subject: [PATCH 2/7] fix: make sure we're testing the right data-lens --- .github/workflows/test.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index a0d20c9..5a14260 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -58,9 +58,10 @@ jobs: run: | export PATH="$HOME/.nix-profile/bin:$PATH" cd "$GITHUB_WORKSPACE" + ln -s "$GITHUB_WORKSPACE" "$HOME/quicklisp/local-projects" sbcl --disable-debugger --no-userinit \ --load "$HOME/quicklisp/setup.lisp" \ --eval "(mapcar 'asdf:load-asd (directory \"*.asd\"))" \ - --eval "(handler-case (asdf:test-system :data-lens) (error () (uiop:quit 42)))" \ - --eval "(handler-case (asdf:test-system :data-lens/transducers) (error () (uiop:quit 43)))" \ + --eval "(handler-case (asdf:test-system :data-lens) (error (c) (format t \"~a\" c) (uiop:quit 42)))" \ + --eval "(handler-case (asdf:test-system :data-lens/transducers) (error (c) (format t \"~a\" c) (uiop:quit 43)))" \ --quit From ec166b4a7d3d26e8582677ab818be5b0cd2eff04 Mon Sep 17 00:00:00 2001 From: Ed L Date: Fri, 1 Sep 2023 11:58:20 -0700 Subject: [PATCH 3/7] fix: make github workflow test more failures --- .github/workflows/test.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 5a14260..544d3d1 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -62,6 +62,8 @@ jobs: sbcl --disable-debugger --no-userinit \ --load "$HOME/quicklisp/setup.lisp" \ --eval "(mapcar 'asdf:load-asd (directory \"*.asd\"))" \ - --eval "(handler-case (asdf:test-system :data-lens) (error (c) (format t \"~a\" c) (uiop:quit 42)))" \ - --eval "(handler-case (asdf:test-system :data-lens/transducers) (error (c) (format t \"~a\" c) (uiop:quit 43)))" \ + --eval "(handler-case (ql:quickload :data-lens) (error (c) (format t \"~a\" c) (uiop:quit 42)))" \ + --eval "(handler-case (ql:quickload :data-lens/transducers) (error (c) (format t \"~a\" c) (uiop:quit 43)))" \ + --eval "(handler-case (asdf:test-system :data-lens) (error (c) (format t \"~a\" c) (uiop:quit 44)))" \ + --eval "(handler-case (asdf:test-system :data-lens/transducers) (error (c) (format t \"~a\" c) (uiop:quit 45)))" \ --quit From 5de14dbe745285a7722a63b0561b8f12cf87be5e Mon Sep 17 00:00:00 2001 From: Ed L Date: Fri, 1 Sep 2023 11:59:57 -0700 Subject: [PATCH 4/7] fix: quickload test system --- .github/workflows/test.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 544d3d1..aa855bb 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -64,6 +64,7 @@ jobs: --eval "(mapcar 'asdf:load-asd (directory \"*.asd\"))" \ --eval "(handler-case (ql:quickload :data-lens) (error (c) (format t \"~a\" c) (uiop:quit 42)))" \ --eval "(handler-case (ql:quickload :data-lens/transducers) (error (c) (format t \"~a\" c) (uiop:quit 43)))" \ - --eval "(handler-case (asdf:test-system :data-lens) (error (c) (format t \"~a\" c) (uiop:quit 44)))" \ - --eval "(handler-case (asdf:test-system :data-lens/transducers) (error (c) (format t \"~a\" c) (uiop:quit 45)))" \ + --eval "(handler-case (ql:quickload :data-lens/test) (error (c) (format t \"~a\" c) (uiop:quit 44)))" \ + --eval "(handler-case (asdf:test-system :data-lens) (error (c) (format t \"~a\" c) (uiop:quit 45)))" \ + --eval "(handler-case (asdf:test-system :data-lens/transducers) (error (c) (format t \"~a\" c) (uiop:quit 46)))" \ --quit From c7af5afb408c23816cf47eda4beb36f5177f1ba2 Mon Sep 17 00:00:00 2001 From: Ed L Date: Fri, 1 Sep 2023 12:06:54 -0700 Subject: [PATCH 5/7] chore: update actions --- .github/workflows/test.yml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index aa855bb..86b1792 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -20,9 +20,15 @@ jobs: steps: # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - - uses: cachix/install-nix-action@v19 + - uses: cachix/cachix-action@v12 + with: + name: data-lens + authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}' + extraPullNames: nix-community + + - uses: cachix/install-nix-action@v22 with: extra_nix_config: | access-tokens = github.com=${{ secrets.GITHUB_TOKEN }} From 4614d366fb266b6b62ad1f6f68d630abe0571227 Mon Sep 17 00:00:00 2001 From: Ed L Date: Fri, 1 Sep 2023 12:07:47 -0700 Subject: [PATCH 6/7] fix: install nix before cachix --- .github/workflows/test.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 86b1792..581d4a3 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -22,17 +22,17 @@ jobs: # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - uses: actions/checkout@v3 + - uses: cachix/install-nix-action@v22 + with: + extra_nix_config: | + access-tokens = github.com=${{ secrets.GITHUB_TOKEN }} + - uses: cachix/cachix-action@v12 with: name: data-lens authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}' extraPullNames: nix-community - - uses: cachix/install-nix-action@v22 - with: - extra_nix_config: | - access-tokens = github.com=${{ secrets.GITHUB_TOKEN }} - # Runs a set of commands using the runners shell - name: setup deps run: | From 12e689eb5201c6c3708cf8124602d9100882e94b Mon Sep 17 00:00:00 2001 From: Ed L Date: Fri, 1 Sep 2023 12:10:19 -0700 Subject: [PATCH 7/7] chore: (bump)