Skip to content

Commit

Permalink
Merge pull request #12 from TopixIM/updates
Browse files Browse the repository at this point in the history
workflow updates
  • Loading branch information
csvwolf committed Jun 12, 2023
2 parents 009f39d + 163edf3 commit d2869d6
Show file tree
Hide file tree
Showing 6 changed files with 210 additions and 244 deletions.
40 changes: 12 additions & 28 deletions .github/workflows/upload.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,38 +14,22 @@ jobs:

- uses: actions/setup-node@v3
with:
node-version: 16
node-version: 18
cache: 'yarn'

- name: ACTIONS_ALLOW_UNSECURE_COMMANDS
id: ACTIONS_ALLOW_UNSECURE_COMMANDS
run: echo 'ACTIONS_ALLOW_UNSECURE_COMMANDS=true' >> $GITHUB_ENV

- name: add cr
run: |
mkdir -p $GITHUB_WORKSPACE/bin
wget -O $GITHUB_WORKSPACE/bin/cr https://github.com/calcit-lang/calcit/releases/download/0.6.20/cr
chmod +x $GITHUB_WORKSPACE/bin/cr
echo "::add-path::$GITHUB_WORKSPACE/bin"
- uses: supplypike/setup-bin@v3
with:
uri: 'https://github.com/calcit-lang/calcit/releases/download/0.7.0-a7/cr'
name: 'cr'
version: '0.7.0-a7'

- name: "prepare modules"
run: >
mkdir -p ~/.config/calcit/modules/ && cd ~/.config/calcit/modules/
&& git clone https://github.com/calcit-lang/lilac.git
&& git clone https://github.com/calcit-lang/memof.git
&& git clone https://github.com/calcit-lang/recollect.git
&& git clone https://github.com/Respo/respo.calcit.git
&& git clone https://github.com/Respo/respo-ui.calcit.git
&& git clone https://github.com/Respo/respo-message.calcit.git
&& git clone https://github.com/Cumulo/cumulo-util.calcit.git
&& git clone https://github.com/Cumulo/cumulo-reel.calcit.git
&& git clone https://github.com/mvc-works/ws-edn.calcit.git
&& git clone https://github.com/Respo/respo-feather.calcit.git
&& git clone https://github.com/Respo/alerts.calcit.git
&& git clone https://github.com/calcit-lang/calcit-wss.git
&& git clone https://github.com/calcit-lang/calcit.std.git
- uses: supplypike/setup-bin@v3
with:
uri: 'https://github.com/calcit-lang/calcit/releases/download/0.7.0-a7/caps'
name: 'caps'
version: '0.7.0-a7'

- run: cr --entry server --emit-ir -1
- run: caps --ci && cr --entry server --emit-ir -1

- run: yarn && yarn compile-page && yarn release-page

Expand Down
2 changes: 1 addition & 1 deletion calcit.cirru

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

2 changes: 1 addition & 1 deletion compact.cirru
Original file line number Diff line number Diff line change
Expand Up @@ -512,7 +512,7 @@
defn run-server! (port)
wss-serve! (&{} :port port)
fn (data)
key-match data
tag-match data
:connect sid
do (dispatch! :session/connect nil sid) (println "\"New client.")
(:message sid msg)
Expand Down
15 changes: 15 additions & 0 deletions package.cirru
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{}
:dependencies $ {}
|calcit-lang/lilac |main
|calcit-lang/memof |main
|calcit-lang/recollect |main
|Respo/respo.calcit |main
|Respo/respo-ui.calcit |main
|Respo/respo-message.calcit |main
|Cumulo/cumulo-util.calcit |main
|Cumulo/cumulo-reel.calcit |main
|mvc-works/ws-edn.calcit |main
|Respo/respo-feather.calcit |main
|Respo/alerts.calcit |main
|calcit-lang/calcit-wss |main
|calcit-lang/calcit.std |main
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@
"author": "jiyinyiyong",
"license": "MIT",
"dependencies": {
"@calcit/procs": "^0.6.20",
"dayjs": "^1.11.7",
"@calcit/procs": "^0.7.0-a7",
"dayjs": "^1.11.8",
"shortid": "^2.2.16"
},
"devDependencies": {
"bottom-tip": "^0.1.3",
"bottom-tip": "^0.1.5",
"feather-icons": "^4.29.0",
"url-parse": "^1.5.10",
"vite": "^4.0.5"
"vite": "^4.3.9"
}
}
Loading

0 comments on commit d2869d6

Please sign in to comment.