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
1 change: 0 additions & 1 deletion .gitattributes
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@

calcit.cirru -diff linguist-generated
yarn.lock -diff linguist-generated
96 changes: 48 additions & 48 deletions .github/workflows/npm-publish.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,51 +9,51 @@ jobs:
publish-npm:
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v6

- uses: actions/setup-node@v6
with:
node-version: 24
registry-url: https://registry.npmjs.org/
cache: yarn

- uses: calcit-lang/setup-cr@0.0.9

- run: caps --ci && yarn && yarn compile-server && yarn compile-page && yarn release-page

# - run: mkdir -p dist-server && mv js-out/bundle.js dist-server
# name: Copy server scripts

- name: Upload web assets
id: deploy
uses: Pendect/action-rsyncer@v2.0.0
env:
DEPLOY_KEY: ${{secrets.rsync_private_key}}
with:
flags: '-avzr --progress'
options: ''
ssh_options: ''
src: 'dist/*'
dest: 'rsync-user@tiye.me:/web-assets/repo/${{ github.repository }}'

- name: Display status from deploy
run: echo "${{ steps.deploy.outputs.status }}"

# - name: Upload server script
# id: deploy-server
# uses: Pendect/action-rsyncer@v1.1.0
# env:
# DEPLOY_KEY: ${{secrets.rsync_private_key}}
# with:
# flags: '-avzr --progress'
# options: ''
# ssh_options: ''
# src: 'dist-server/*'
# dest: 'rsync-user@tiye.me:/servers/rebase-hell/'

# - name: Display status from deploy
# run: echo "${{ steps.deploy-server.outputs.status }}"

- run: npm publish
env:
NODE_AUTH_TOKEN: ${{secrets.npm_token}}
- uses: actions/checkout@v6
- uses: actions/setup-node@v6
with:
node-version: 24
registry-url: https://registry.npmjs.org/
cache: yarn
- uses: calcit-lang/setup-calcit@6a2e53ae41e4f0d5856a424b9ed4470d90ea6876

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

应该用版本号

- run: caps --ci && yarn && yarn compile-server && yarn compile-page && yarn release-page
# - run: mkdir -p dist-server && mv js-out/bundle.js dist-server
# name: Copy server scripts
- name: Upload web assets
id: deploy
uses: Pendect/action-rsyncer@v2.0.0
env:
DEPLOY_KEY: ${{secrets.rsync_private_key}}
with:
flags: '-avzr --progress'
options: ''
ssh_options: ''
src: 'dist/*'
dest: 'rsync-user@tiye.me:/web-assets/repo/${{ github.repository }}'
- name: Display status from deploy
run: echo "${{ steps.deploy.outputs.status }}"
# - name: Upload server script
# id: deploy-server
# uses: Pendect/action-rsyncer@v1.1.0
# env:
# DEPLOY_KEY: ${{secrets.rsync_private_key}}
# with:
# flags: '-avzr --progress'
# options: ''
# ssh_options: ''
# src: 'dist-server/*'
# dest: 'rsync-user@tiye.me:/servers/rebase-hell/'
# - name: Display status from deploy
# run: echo "${{ steps.deploy-server.outputs.status }}"
- run: npm publish
env:
NODE_AUTH_TOKEN: ${{secrets.npm_token}}
2 changes: 1 addition & 1 deletion .github/workflows/upload.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
node-version: 24
cache: 'yarn'

- uses: calcit-lang/setup-cr@0.0.9
- uses: calcit-lang/setup-calcit@6a2e53ae41e4f0d5856a424b9ed4470d90ea6876

- run: caps --ci && yarn install --immutable && yarn compile-server && yarn compile-page && yarn release-page

Expand Down
2 changes: 1 addition & 1 deletion calcit.cirru
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

{} (: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)
{} (: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.server/main!) (:mode :native) (:reload-fn 'app.server/reload!)
:feature-policy $ {}
Expand Down
2 changes: 1 addition & 1 deletion deps.cirru
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

{} (:calcit-version |0.13.27)
{} (:calcit-version |0.13.29)
:version |0.1.19
:dependencies $ {} (|Cumulo/cumulo-reel.calcit |0.0.24)
|Cumulo/cumulo-util.calcit |0.0.13
Expand Down
5 changes: 5 additions & 0 deletions history/2026082222-upgrade-calcit-01329.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# 2026082222 Upgrade Calcit and expose source

- Updated Calcit and @calcit/procs to 0.13.29.
- Replaced setup-cr workflow references with setup-calcit and updated package commands.
- Removed the linguist-generated rule hiding calcit.cirru.
10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
"main": "./server.mjs",
"bin": "./server.mjs",
"scripts": {
"watch-server": "cr js",
"compile-server": "cr js",
"compile-page": "cr --entry page --emit-path out-page js",
"watch-server": "calcit calcit.cirru js",
"compile-server": "calcit calcit.cirru js",
"compile-page": "calcit calcit.cirru --entry page --emit-path out-page js",
"release-page": "vite build --base=./",
"watch-page": "cr --entry page --emit-path out-page/ js"
"watch-page": "calcit calcit.cirru --entry page --emit-path out-page/ js"
},
"repository": {
"type": "git",
Expand All @@ -19,7 +19,7 @@
"author": "jiyinyiyong",
"license": "MIT",
"dependencies": {
"@calcit/procs": "^0.13.27",
"@calcit/procs": "^0.13.29",
"chalk": "^5.3.0",
"dayjs": "^1.11.11",
"latest-version": "^9.0.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.