Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
48 changes: 38 additions & 10 deletions .github/workflows/upload.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ on:
- main
pull_request: {}

permissions:
contents: read

jobs:
test:
runs-on: ubuntu-latest
Expand All @@ -32,31 +35,54 @@ jobs:
- name: Install JavaScript dependencies
run: yarn install --immutable

- name: Verify Calcit toolchain
run: caps verify --toolchain

- name: Check canonical Calcit snapshot
run: |
before="$(sha256sum calcit.cirru | cut -d ' ' -f 1)"
calcit calcit.cirru edit format
after="$(sha256sum calcit.cirru | cut -d ' ' -f 1)"
test "$before" = "$after"
git diff --exit-code -- calcit.cirru

- name: Check Calcit types
run: calcit calcit.cirru --check-only

- name: Check application dynamic methods
run: calcit calcit.cirru analyze dynamic-methods --max 0 --format json

- name: Audit provider dynamic methods
run: calcit calcit.cirru analyze dynamic-methods --deps --format json

- name: Check Calcit quality baseline
run: calcit calcit.cirru analyze quality --baseline config/calcit-quality.cirru

- name: Compile Calcit JavaScript
run: calcit calcit.cirru js
- name: Run Calcit regression tests
run: calcit calcit.cirru test --summary-only --format json

- name: Build site
run: yarn vite build --base=./
- name: Build extension package
run: yarn build

- name: Validate extension package
run: |
test -f extension/dist/index.html
find extension/dist/assets -maxdepth 1 -name '*.css' -print -quit | grep -q .
node --check extension/content.js
node --check extension/service-worker.js
node --check extension/get-selected.mjs
node -e 'const manifest = require("./extension/manifest.json"); if (manifest.manifest_version !== 3 || manifest.side_panel?.default_path !== "dist/index.html") process.exit(1)'

- name: Select deployment path
if: github.event_name == 'push' && github.ref == 'refs/heads/main'
id: deploy-path
env:
EVENT_NAME: ${{ github.event_name }}
REPOSITORY: ${{ github.repository }}
run: |
if [ "$EVENT_NAME" = "pull_request" ]; then
echo "dest=rsync-user@tiye.me:/web-assets/repo/${REPOSITORY}/pr" >> "$GITHUB_OUTPUT"
else
echo "dest=rsync-user@tiye.me:/web-assets/repo/${REPOSITORY}" >> "$GITHUB_OUTPUT"
fi
echo "dest=rsync-user@tiye.me:/web-assets/repo/${REPOSITORY}" >> "$GITHUB_OUTPUT"

- name: Prepare deployment directory
if: github.event_name == 'push' && github.ref == 'refs/heads/main'
env:
DEPLOY_KEY: ${{ secrets.rsync_private_key }}
DEPLOY_DEST: ${{ steps.deploy-path.outputs.dest }}
Expand All @@ -68,6 +94,7 @@ jobs:
ssh -i "$key_file" -o StrictHostKeyChecking=no rsync-user@tiye.me "mkdir -p -- '$deploy_path'"

- name: Deploy to server
if: github.event_name == 'push' && github.ref == 'refs/heads/main'
id: deploy
uses: Pendect/action-rsyncer@v2.0.0
env:
Expand All @@ -80,4 +107,5 @@ jobs:
dest: ${{ steps.deploy-path.outputs.dest }}

- name: Display status from deploy
if: github.event_name == 'push' && github.ref == 'refs/heads/main'
run: echo "${{ steps.deploy.outputs.status }}"
19 changes: 13 additions & 6 deletions calcit.cirru
Original file line number Diff line number Diff line change
Expand Up @@ -138,9 +138,14 @@
if (wo-log done?) (:: :unit)
do
let
events $ -> value .split-lines
filter $ fn (s) (.starts-with? s "|data: ")
events $ -> (stream-text value) .split-lines
filter $ fn (s)
hint-fn $ {}
:args $ [] 'String
.starts-with? s "|data: "
map $ fn (s)
hint-fn $ {}
:args $ [] 'String
-> (.strip-prefix s "|data: ") js/JSON.parse to-calcit-data
apply-args (events)
fn (xs)
Expand Down Expand Up @@ -552,8 +557,10 @@
:code $ quote
defcomp comp-container (reel)
let
raw-store $ option:unwrap-or (get reel :store) store
app-store $ if (struct? raw-store) (unsafe-coerce raw-store 'app.schema/Store) (decode-map-as raw-store 'app.schema/Store)
app-store $ option:fold (get reel :store)
fn () store
fn (raw-store)
if (struct? raw-store) (unsafe-coerce raw-store 'app.schema/Store) (decode-map-as raw-store 'app.schema/Store)
sessions $ :sessions app-store
archived-count $ :archived-count app-store
current-session-id $ :current-session-id app-store
Expand Down Expand Up @@ -2379,15 +2386,15 @@
:tags $ #{} :regression :unit
'store $ %{} 'CodeEntry (:doc |)
:code $ quote
def store $ {}
def store $ %{} Store
Comment thread
tiye marked this conversation as resolved.
:states $ {}
:cursor $ []
:sessions $ []
:current-session-id nil
:model nil
:archived-count 0
:examples $ []
:schema $ :: 'Map
:schema $ :: 'app.schema/Store
:ns $ %{} 'NsEntry (:doc |)
:code $ quote
ns app.schema $ :require
Expand Down
14 changes: 7 additions & 7 deletions deps.cirru
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@

{} (:calcit-version |0.13.75)
{} (:calcit-version |0.13.77)
:version |0.0.5
:dependencies $ {} (|Respo/alerts.calcit |0.10.27)
|Respo/reel.calcit |0.6.11
|Respo/respo-feather.calcit |0.4.8
|Respo/respo-markdown.calcit |0.4.29
|Respo/respo-ui.calcit |0.7.14
|Respo/respo.calcit |0.16.89
:dependencies $ {} (|Respo/alerts.calcit |0.10.29)
|Respo/reel.calcit |0.6.13
|Respo/respo-feather.calcit |0.4.10
|Respo/respo-markdown.calcit |0.4.31
|Respo/respo-ui.calcit |0.7.16
|Respo/respo.calcit |0.16.91
43 changes: 43 additions & 0 deletions history/202609051630-upgrade-calcit-01377.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 17 additions & 0 deletions history/202609051810-fix-toolchain-verification-order.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"dependencies": {
"@calcit/procs": "0.13.75",
"@calcit/procs": "0.13.77",
"@google/genai": "^2.20.0",
"@tiye/main-fonts": "0.0.1",
"axios": "^1.15.0",
Expand Down
10 changes: 5 additions & 5 deletions yarn.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.