Skip to content

Commit 66e3671

Browse files
authored
Merge pull request #22 from calcit-lang/caps
updates to use caps
2 parents 6c46f00 + 973b3da commit 66e3671

File tree

5 files changed

+202
-232
lines changed

5 files changed

+202
-232
lines changed

.github/workflows/npm-publish.yaml.disabled

Lines changed: 0 additions & 21 deletions
This file was deleted.

.github/workflows/upload.yaml

Lines changed: 28 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -10,51 +10,33 @@ jobs:
1010
test:
1111
runs-on: ubuntu-22.04
1212
steps:
13-
- uses: actions/checkout@v2
13+
- uses: actions/checkout@v3
1414

15-
- name: Get yarn cache
16-
id: yarn-cache
17-
run: echo "::set-output name=dir::$(yarn cache dir)"
18-
19-
- uses: actions/cache@v2
20-
name: Cache node modules of yarn
15+
- uses: actions/setup-node@v3
2116
with:
22-
path: ${{ steps.yarn-cache.outputs.dir }}
23-
key: ${{ runner.os }}-yarn-${{ hashFiles('yarn.lock') }}
24-
restore-keys: |
25-
${{ runner.os }}-yarn-
26-
27-
- name: ACTIONS_ALLOW_UNSECURE_COMMANDS
28-
id: ACTIONS_ALLOW_UNSECURE_COMMANDS
29-
run: echo 'ACTIONS_ALLOW_UNSECURE_COMMANDS=true' >> $GITHUB_ENV
17+
node-version: 16
18+
cache: 'yarn'
3019

31-
- name: add cr
32-
run: |
33-
mkdir -p $GITHUB_WORKSPACE/bin
34-
wget -O $GITHUB_WORKSPACE/bin/cr https://github.com/calcit-lang/calcit/releases/download/0.6.16/cr
35-
chmod +x $GITHUB_WORKSPACE/bin/cr
36-
echo "::add-path::$GITHUB_WORKSPACE/bin"
20+
- uses: supplypike/setup-bin@v3
21+
with:
22+
uri: 'https://github.com/calcit-lang/calcit/releases/download/0.6.23/cr'
23+
name: 'cr'
24+
version: '0.6.23'
3725

38-
- name: "prepare modules"
39-
run: >
40-
mkdir -p ~/.config/calcit/modules/ && cd ~/.config/calcit/modules/
41-
&& git clone https://github.com/calcit-lang/lilac.git
42-
&& git clone https://github.com/calcit-lang/memof.git
43-
&& git clone https://github.com/Respo/respo.calcit.git
44-
&& git clone https://github.com/Respo/reel.calcit.git
45-
&& git clone https://github.com/Respo/respo-markdown.calcit.git
46-
&& git clone https://github.com/Respo/respo-ui.calcit.git
47-
&& git clone https://github.com/Respo/respo-router.calcit.git
48-
&& git clone https://github.com/Respo/alerts.calcit.git
26+
- uses: supplypike/setup-bin@v3
27+
with:
28+
uri: 'https://github.com/calcit-lang/calcit/releases/download/0.6.23/caps'
29+
name: 'caps'
30+
version: '0.6.23'
4931

5032
- name: "compiles to js"
5133
run: >
52-
cr --emit-js --once
34+
caps --ci && cr --emit-js --once
5335
&& yarn && yarn vite build --base=./
5436
5537
- name: Deploy to server
5638
id: deploy
57-
uses: Pendect/action-rsyncer@v1.1.0
39+
uses: Pendect/action-rsyncer@v2.0.0
5840
env:
5941
DEPLOY_KEY: ${{secrets.rsync_private_key}}
6042
with:
@@ -67,27 +49,26 @@ jobs:
6749
- name: Display status from deploy
6850
run: echo "${{ steps.deploy.outputs.status }}"
6951

70-
7152
# also need to upload mddook
7253

73-
- name: curl mdbook.tar.gz
74-
run: curl -L https://github.com/rust-lang/mdBook/releases/download/v0.4.14/mdbook-v0.4.14-x86_64-unknown-linux-gnu.tar.gz > ./mdbook.tar.gz
75-
76-
- name: curl linkcheck
77-
run: curl -L https://github.com/Michael-F-Bryan/mdbook-linkcheck/releases/download/v0.7.6/mdbook-linkcheck.x86_64-unknown-linux-gnu.zip > ./linkcheck.zip
78-
79-
- name: tar mdbook
80-
run: tar -zxvf ./mdbook.tar.gz && unzip -n ./linkcheck.zip && chmod +x mdbook-linkcheck
54+
- uses: supplypike/setup-bin@v3
55+
with:
56+
uri: 'https://github.com/rust-lang/mdBook/releases/download/v0.4.14/mdbook-v0.4.14-x86_64-unknown-linux-gnu.tar.gz'
57+
name: 'mdbook'
58+
version: '0.4.14'
8159

82-
- name: trick path
83-
run: echo "::add-path::$GITHUB_WORKSPACE/"
60+
- uses: supplypike/setup-bin@v3
61+
with:
62+
uri: 'https://github.com/Michael-F-Bryan/mdbook-linkcheck/releases/download/v0.7.6/mdbook-linkcheck.x86_64-unknown-linux-gnu.zip'
63+
name: 'mdbook-linkcheck'
64+
version: '0.7.6'
8465

8566
- name: mdbook build
86-
run: ./mdbook build && mv -v book/html/index.html book/html/mdbook.html
67+
run: mdbook build && mv -v book/html/index.html book/html/mdbook.html
8768

8869
- name: Deploy to server
8970
id: deploy-mdbook
90-
uses: Pendect/action-rsyncer@v1.1.0
71+
uses: Pendect/action-rsyncer@v2.0.0
9172
env:
9273
DEPLOY_KEY: ${{secrets.rsync_private_key}}
9374
with:

package.cirru

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
{}
2+
:dependencies $ {}
3+
|calcit-lang/lilac |main
4+
|calcit-lang/memof |main
5+
|Respo/respo.calcit |main
6+
|Respo/reel.calcit |main
7+
|Respo/respo-markdown.calcit |main
8+
|Respo/respo-ui.calcit |main
9+
|Respo/respo-router.calcit |main
10+
|Respo/alerts.calcit |main

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22
"version": "0.0.14",
33
"name": "@calcit/docs-workflow",
44
"dependencies": {
5-
"@calcit/procs": "^0.6.16"
5+
"@calcit/procs": "^0.6.23"
66
},
77
"devDependencies": {
88
"bottom-tip": "^0.1.3",
99
"cirru-color": "^0.2.3",
10-
"github-markdown-css": "^5.1.0",
10+
"github-markdown-css": "^5.2.0",
1111
"highlight.js": "^11.7.0",
1212
"remarkable": "^2.0.1",
13-
"vite": "^3.2.4"
13+
"vite": "^4.1.3"
1414
}
1515
}

0 commit comments

Comments
 (0)