Skip to content

Commit

Permalink
Merge pull request #9 from Quamolit/updates
Browse files Browse the repository at this point in the history
workflow updates
  • Loading branch information
csvwolf authored Jun 12, 2023
2 parents d26334f + dd76275 commit e3a27ce
Show file tree
Hide file tree
Showing 5 changed files with 191 additions and 877 deletions.
38 changes: 17 additions & 21 deletions .github/workflows/upload.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,37 +10,33 @@ jobs:
test:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- name: ACTIONS_ALLOW_UNSECURE_COMMANDS
id: ACTIONS_ALLOW_UNSECURE_COMMANDS
run: echo 'ACTIONS_ALLOW_UNSECURE_COMMANDS=true' >> $GITHUB_ENV
- uses: actions/setup-node@v3
with:
node-version: 18
cache: 'yarn'

- 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.1/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/Respo/respo.calcit.git
&& git clone https://github.com/Respo/reel.calcit.git
&& git clone https://github.com/Respo/respo-markdown.calcit.git
&& git clone https://github.com/Respo/respo-ui.calcit.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'

- name: "compiles to js"
run: >
cr --emit-js -1
caps --ci && cr --emit-js -1
&& yarn && yarn vite build --base=./
- name: Deploy to server
id: deploy
uses: Pendect/action-rsyncer@v1.1.0
uses: Pendect/action-rsyncer@v2.0.0
env:
DEPLOY_KEY: ${{secrets.rsync_private_key}}
with:
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Quamolit Home
### Workflow

Workflow https://github.com/mvc-works/calcit-workflow
Workflow https://github.com/calcit-lang/respo-calcit-workflow

### License

Expand Down
8 changes: 8 additions & 0 deletions package.cirru
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{}
:dependencies $ {}
|calcit-lang/lilac |main
|calcit-lang/memof |main
|Respo/respo.calcit |main
|Respo/reel.calcit |main
|Respo/respo-markdown.calcit |main
|Respo/respo-ui.calcit |main
11 changes: 2 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,6 @@
"description": "ClojureScript workflow using Calcit Editor",
"main": "index.js",
"scripts": {
"deploy": "clj -A:release",
"watch": "shadow-cljs watch client",
"build-cdn": "shadow-cljs clj-run build.main/build-cdn",
"build": "shadow-cljs clj-run build.main/build",
"up": "yarn build-cdn && tiye-up",
"page": "shadow-cljs clj-run build.main/page",
"ln": "cd target && rm -f entry && ln -s ../entry"
},
"repository": {
Expand All @@ -19,11 +13,10 @@
"author": "jiyinyiyong",
"license": "MIT",
"devDependencies": {
"shadow-cljs": "^2.19.6",
"vite": "^3.2.7"
"vite": "^4.3.9"
},
"dependencies": {
"@calcit/procs": "^0.6.1",
"@calcit/procs": "^0.7.0-a7",
"feather-icons": "^4.29.0"
}
}
Loading

0 comments on commit e3a27ce

Please sign in to comment.