Skip to content

Upgrade to Calcit 0.13.77 #37

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tiye merged 3 commits into from
Sep 6, 2026
Merged

Upgrade to Calcit 0.13.77 #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2d745bf
Upgrade cumulo.org to Calcit 0.13.77
tiye Sep 6, 2026
0a377d6
Pin rsync action to resolved v2.0.0 commit
tiye Sep 6, 2026
550e69e
Use complete rsync action commit SHA
tiye Sep 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 27 additions & 11 deletions .github/workflows/upload.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,40 +6,55 @@ on:
- main
pull_request: {}

permissions:
contents: read

jobs:
test:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
with:
persist-credentials: false

- uses: actions/setup-node@v6
- uses: actions/setup-node@249970729cb0ef3589644e2896645e5dc5ba9c38 # v6.5.0
with:
node-version: 24
package-manager-cache: false

- name: Enable Corepack
run: |
corepack enable
corepack prepare yarn@4.12.0 --activate
yarn --version

- uses: calcit-lang/setup-cr@0.0.9
- uses: calcit-lang/setup-calcit@704b3f5cd6f9ce3bd1e0c926dbdd1d181adb8180 # v1.4.0
with:
tools: calcit,caps

- name: Install dependencies
run: caps --ci && yarn install --immutable
- name: Resolve immutable dependencies
run: |
set -euo pipefail
caps --strict --ci
yarn install --immutable
caps verify --toolchain

- name: Validate and build
run: |
cr calcit.cirru edit format
set -euo pipefail
calcit calcit.cirru edit format
git diff --exit-code -- calcit.cirru
cr calcit.cirru --check-only
cr calcit.cirru analyze check-types --summary-only --format json
cr calcit.cirru analyze weak-types --only schema-dynamic,code-dynamic --intent unresolved --summary-only --format json
cr calcit.cirru js
calcit calcit.cirru --check-only
calcit calcit.cirru analyze dynamic-methods --max 0
calcit calcit.cirru analyze deprecated --summary-only
calcit calcit.cirru analyze quality --baseline config/calcit-quality.cirru
calcit calcit.cirru js
yarn vite build --base=./

- name: Deploy to server
if: github.event_name == 'push' && github.ref == 'refs/heads/main'
id: deploy
uses: Pendect/action-rsyncer@v2.0.0
uses: Pendect/action-rsyncer@8e05ffa5c93e5d9c9b167796b26044d2c616b2b9 # v2.0.0
env:
DEPLOY_KEY: ${{secrets.rsync_private_key}}
with:
Expand All @@ -50,4 +65,5 @@ jobs:
dest: 'rsync-user@tiye.me:/web-assets/repo/${{ github.repository }}'

- name: Display status from deploy
if: github.event_name == 'push' && github.ref == 'refs/heads/main'
run: echo "${{ steps.deploy.outputs.status }}"
84 changes: 45 additions & 39 deletions calcit.cirru
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,22 @@

{} (:about "|Machine-generated snapshot. Do not edit directly — changes will be overwritten. Use `cr query` to inspect and `cr edit`/`cr tree` to modify. Run `cr docs agents --full` first. Manual edits must follow format and schema conventions, then run `cr edit format`.") (:package |app) (:version |0.0.1)
{} (:about "|Machine-generated snapshot. Do not edit directly — changes will be overwritten. Use `calcit query` to inspect and `calcit edit`/`calcit tree` to modify. Run `calcit docs agents --full` first. Manual edits must follow format and schema conventions, then run `calcit edit format`.") (:package |app)
:entries $ {}
:default $ {} (:description |) (:init-fn 'app.main/main!) (:mode :js) (:reload-fn 'app.main/reload!)
:feature-policy $ {}
:modules $ [] |respo.calcit/ |lilac/ |memof/ |respo-ui.calcit/ |respo-markdown.calcit/ |reel.calcit/
:type-slots $ {}
:files $ {}
|app.comp.container $ %{} 'FileEntry
'app.comp.container $ %{} 'FileEntry
:defs $ {}
|comp-container $ %{} 'CodeEntry (:doc |)
'comp-container $ %{} 'CodeEntry (:doc |)
:code $ quote
defcomp comp-container (reel)
let
store $ unsafe-coerce (get reel :store) 'app.types/Store
states $ &struct:get store :states
states $ :states store
div
{} $ :style
merge ui/global ui/fullscreen ui/row $ {} (:justify-content :center)
merge ui/global ui/fullscreen ui/row $ {} (:justify-content |center)
div
{} $ :style
{} (:max-width 800) (:width |60%)
Expand All @@ -33,11 +34,16 @@
when dev? $ comp-reel (>> states :reel) reel ({})
:examples $ []
:schema $ :: 'Dynamic
|slurp $ %{} 'CodeEntry (:doc |)
'slurp $ %{} 'CodeEntry (:doc |)
:code $ quote
defmacro slurp (path) (read-file path)
defmacro slurp (path)
read-file $ str path
:examples $ []
:schema $ :: 'Dynamic
:schema $ :: 'Macro
{}
:capabilities $ #{} :fs-read
:expansion $ :: 'Expr 'String
:required $ [] (:: 'Expr 'String)
:ns $ %{} 'NsEntry (:doc |)
:code $ quote
ns app.comp.container $ :require
Expand All @@ -51,9 +57,9 @@
respo-md.comp.md :refer $ comp-md-block
|highlight.js :default hljs
|cirru-color :as color
|app.config $ %{} 'FileEntry
'app.config $ %{} 'FileEntry
:defs $ {}
|cdn? $ %{} 'CodeEntry (:doc |)
'cdn? $ %{} 'CodeEntry (:doc |)
:code $ quote
def cdn? $ cond
exists? js/window
Expand All @@ -62,13 +68,13 @@
:else false
:examples $ []
:schema $ :: 'Dynamic
|dev? $ %{} 'CodeEntry (:doc |)
'dev? $ %{} 'CodeEntry (:doc |)
:code $ quote
def dev? $ = |dev
option:unwrap-or (get-env |mode) |release
:examples $ []
:schema $ :: 'Bool
|site $ %{} 'CodeEntry (:doc |)
'site $ %{} 'CodeEntry (:doc |)
:code $ quote
def site $ %{} app.types/SiteConfig (:dev-ui |http://localhost:8100/main-fonts.css) (:release-ui |http://cdn.tiye.me/favored-fonts/main-fonts.css) (:cdn-url |http://cdn.tiye.me/cumulo-org/) (:title "|Cumulo Home Page") (:icon |http://cdn.tiye.me/logo/respo.png) (:storage-key |cumulo.org)
:examples $ []
Expand All @@ -77,20 +83,20 @@
:code $ quote
ns app.config $ :require
app.types :refer $ SiteConfig
|app.main $ %{} 'FileEntry
'app.main $ %{} 'FileEntry
:defs $ {}
|*reel $ %{} 'CodeEntry (:doc |)
'*reel $ %{} 'CodeEntry (:doc |)
:code $ quote
defatom *reel $ -> reel-schema/reel (assoc :base schema/store) (assoc :store schema/store)
:examples $ []
:schema $ :: 'Dynamic
|dispatch! $ %{} 'CodeEntry (:doc |)
'dispatch! $ %{} 'CodeEntry (:doc |)
:code $ quote
defn dispatch! (op) (; println |Dispatch: op)
reset! *reel $ reel-updater updater @*reel op
:examples $ []
:schema $ :: 'Dynamic
|main! $ %{} 'CodeEntry (:doc |)
'main! $ %{} 'CodeEntry (:doc |)
:code $ quote
defn main! ()
println "|Running mode:" $ if config/dev? |dev |release
Expand All @@ -103,39 +109,39 @@
js/window.addEventListener |beforeunload persist-storage!
js/setInterval persist-storage! $ * 1000 60
let
raw $ js/localStorage.getItem (&struct:get config/site :storage-key)
raw $ js/localStorage.getItem (:storage-key config/site)
when (js-present? raw)
dispatch! $ :: :hydrate-storage
parse-cirru-edn $ unsafe-coerce raw String
println "|App started."
:examples $ []
:schema $ :: 'Dynamic
|mount-target $ %{} 'CodeEntry (:doc |)
'mount-target $ %{} 'CodeEntry (:doc |)
:code $ quote
def mount-target $ js/document.querySelector |.app
:examples $ []
:schema $ :: 'Dynamic
|persist-storage! $ %{} 'CodeEntry (:doc |)
'persist-storage! $ %{} 'CodeEntry (:doc |)
:code $ quote
defn persist-storage! (? e)
js/localStorage.setItem (&struct:get config/site :storage-key)
format-cirru-edn $ &struct:get @*reel :store
js/localStorage.setItem (:storage-key config/site)
format-cirru-edn $ reel-schema/read-field @*reel :store
:examples $ []
:schema $ :: 'Dynamic
|reload! $ %{} 'CodeEntry (:doc |)
'reload! $ %{} 'CodeEntry (:doc |)
:code $ quote
defn reload! () (clear-cache!)
reset! *reel $ refresh-reel @*reel schema/store updater
println "|Code updated."
:examples $ []
:schema $ :: 'Dynamic
|render-app! $ %{} 'CodeEntry (:doc |)
'render-app! $ %{} 'CodeEntry (:doc |)
:code $ quote
defn render-app! (renderer)
renderer mount-target (comp-container @*reel) dispatch!
:examples $ []
:schema $ :: 'Dynamic
|ssr? $ %{} 'CodeEntry (:doc |)
'ssr? $ %{} 'CodeEntry (:doc |)
:code $ quote
def ssr? $ js-present? (js/document.querySelector |meta.respo-ssr)
:examples $ []
Expand All @@ -155,9 +161,9 @@
|highlight.js :default hljs
|highlight.js/lib/languages/clojure :default clojure-lang
|highlight.js/lib/languages/bash :default bash-lang
|app.page $ %{} 'FileEntry
'app.page $ %{} 'FileEntry
:defs $ {}
|base-info $ %{} 'CodeEntry (:doc |)
'base-info $ %{} 'CodeEntry (:doc |)
:code $ quote
def base-info $ {}
:title $ :title config/site
Expand All @@ -166,7 +172,7 @@
:inline-html nil
:examples $ []
:schema $ :: 'Dynamic
|dev-page $ %{} 'CodeEntry (:doc |)
'dev-page $ %{} 'CodeEntry (:doc |)
:code $ quote
defn dev-page () $ make-page |
merge base-info $ {}
Expand All @@ -175,7 +181,7 @@
:inline-styles $ [] (slurp |entry/github-gist.css) (slurp |node_modules/github-markdown-css/github-markdown.css)
:examples $ []
:schema $ :: 'Dynamic
|main! $ %{} 'CodeEntry (:doc |)
'main! $ %{} 'CodeEntry (:doc |)
:code $ quote
defn main! ()
println "|Running mode:" $ if config/dev? |dev |release
Expand All @@ -184,7 +190,7 @@
spit |dist/index.html $ prod-page
:examples $ []
:schema $ :: 'Dynamic
|prod-page $ %{} 'CodeEntry (:doc |)
'prod-page $ %{} 'CodeEntry (:doc |)
:code $ quote
defn prod-page () $ let
reel $ -> reel-schema/reel (assoc :base schema/store) (assoc :store schema/store)
Expand Down Expand Up @@ -212,9 +218,9 @@
app.config :as config
cumulo-util.build :refer $ get-ip!
clojure.core.strint :refer $ <<
|app.schema $ %{} 'FileEntry
'app.schema $ %{} 'FileEntry
:defs $ {}
|store $ %{} 'CodeEntry (:doc |)
'store $ %{} 'CodeEntry (:doc |)
:code $ quote
def store $ %{} app.types/Store
:states $ {}
Expand All @@ -225,26 +231,26 @@
:code $ quote
ns app.schema $ :require
app.types :refer $ Store
|app.types $ %{} 'FileEntry
'app.types $ %{} 'FileEntry
:defs $ {}
|SiteConfig $ %{} 'CodeEntry (:doc |)
'SiteConfig $ %{} 'CodeEntry (:doc |)
:code $ quote
defstruct SiteConfig (:dev-ui 'String) (:release-ui 'String) (:cdn-url 'String) (:title 'String) (:icon 'String) (:storage-key 'String)
:examples $ []
:schema $ :: 'Dynamic
|Store $ %{} 'CodeEntry (:doc |)
:schema $ :: 'StructDef
'Store $ %{} 'CodeEntry (:doc |)
:code $ quote
defstruct Store (:states 'Map) (:content 'String)
:examples $ []
:schema $ :: 'Dynamic
:schema $ :: 'StructDef
:ns $ %{} 'NsEntry (:doc |)
:code $ quote (ns app.types)
|app.updater $ %{} 'FileEntry
'app.updater $ %{} 'FileEntry
:defs $ {}
|updater $ %{} 'CodeEntry (:doc |)
'updater $ %{} 'CodeEntry (:doc |)
:code $ quote
defn updater (store op op-id op-time)
tag-match op
match op
(:states cursor s) (update-states store cursor s)
(:content c) (assoc store :content c)
(:hydrate-storage d) d
Expand Down
Loading