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
91 changes: 36 additions & 55 deletions .github/workflows/upload.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,58 +11,39 @@ jobs:
test:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2

- name: Get yarn cache
id: yarn-cache
run: echo "::set-output name=dir::$(yarn cache dir)"

- uses: actions/cache@v2
name: Cache node modules of yarn
with:
path: ${{ steps.yarn-cache.outputs.dir }}
key: ${{ runner.os }}-yarn-${{ hashFiles('yarn.lock') }}
restore-keys: |
${{ runner.os }}-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 http://repo.calcit-lang.org/binaries/linux/cr
chmod +x $GITHUB_WORKSPACE/bin/cr
echo "::add-path::$GITHUB_WORKSPACE/bin"

- 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
&& git clone https://github.com/Respo/respo-feather.calcit.git

- name: "compiles to js"
run: >
cr --emit-js --once
&& yarn && yarn vite build --base=./

- name: Deploy to server
id: deploy
uses: Pendect/action-rsyncer@v1.1.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 }}"
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: 22
- uses: calcit-lang/setup-calcit@v1.5.1
with:
version: "0.42.1"
tools: calcit,caps
- name: Install dependencies
run: |
set -euo pipefail
corepack enable
yarn install --immutable
caps --ci
- name: Validate Calcit
run: |
set -euo pipefail
calcit calcit.cirru edit format
git diff --exit-code -- calcit.cirru
calcit calcit.cirru --check-only
calcit calcit.cirru fix --workflow strict --verify
- name: Build
run: yarn build
- name: Deploy to server
id: deploy
uses: Pendect/action-rsyncer@v1.1.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 }}"
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,5 @@
js-out/
node_modules/
dist/

.yarn/
6 changes: 6 additions & 0 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
approvedGitRepositories:
- "**"

enableScripts: true

nodeLinker: node-modules
3,092 changes: 119 additions & 2,973 deletions calcit.cirru

Large diffs are not rendered by default.

228 changes: 0 additions & 228 deletions compact.cirru

This file was deleted.

4 changes: 4 additions & 0 deletions deps.cirru
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{} (:calcit-version |0.42.1)
:version |0.0.1
:dependencies $ {} (|Respo/respo.calcit |0.19.9)
|Respo/respo-ui.calcit |0.15.3
5 changes: 2 additions & 3 deletions main.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@

import { main_$x_ } from "./js-out/app.main.js"
import { main_$x_ } from "./js-out/app.main.mjs"

main_$x_()

if (import.meta.hot) {
import.meta.hot.accept('./js-out/app.main.js', (main) => {
import.meta.hot.accept('./js-out/app.main.mjs', (main) => {
main.reload_$x_()
})
}
12 changes: 8 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,10 @@
"version": "0.1.0",
"description": "ClojureScript workflow using Calcit Editor",
"main": "index.js",
"scripts": {},
"scripts": {
"build": "calcit calcit.cirru js && vite build --base=./",
"watch": "calcit calcit.cirru -w"
},
"repository": {
"type": "git",
"url": "git@github.com:mvc-works/calcit-workflow.git"
Expand All @@ -12,11 +15,12 @@
"license": "MIT",
"devDependencies": {
"bottom-tip": "^0.1.2",
"vite": "^2.9.16"
"vite": "^7.0.0"
},
"dependencies": {
"@calcit/procs": "^0.4.16",
"@calcit/procs": "0.42.1",
"feather-icons": "^4.9.0",
"shortid": "^2.2.14"
}
},
"packageManager": "yarn@4.18.0"
}
Loading
Loading