Skip to content

Commit

Permalink
Merge pull request #4 from Phlox-GL/update
Browse files Browse the repository at this point in the history
update to caps
  • Loading branch information
NoEgAm authored May 8, 2023
2 parents 9dccbcd + 98b58ae commit 1a5c198
Show file tree
Hide file tree
Showing 4 changed files with 480 additions and 472 deletions.
42 changes: 18 additions & 24 deletions .github/workflows/upload.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,41 +8,35 @@ on:

jobs:
test:
runs-on: ubuntu-20.04
# runs-on: ubuntu-latest
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.0/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.6.26/cr'
name: 'cr'
version: '0.6.26'

- 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/respo-ui.calcit.git
&& git clone https://github.com/Respo/respo-markdown.calcit
&& git clone https://github.com/Phlox-GL/phlox.git --branch 0.4.46
&& git clone https://github.com/Quatrefoil-GL/touch-control.git
- uses: supplypike/setup-bin@v3
with:
uri: 'https://github.com/calcit-lang/calcit/releases/download/0.6.26/caps'
name: 'caps'
version: '0.6.26'

- name: "compiles to js"
run: >
dev=false cr --emit-js --once
caps --ci && dev=false cr --emit-js --once
&& 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
10 changes: 10 additions & 0 deletions package.cirru
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@

{}
:dependencies $ {}
|calcit-lang/lilac |main
|calcit-lang/memof |main
|Respo/respo.calcit |main
|Respo/respo-ui.calcit |main
|Respo/respo-markdown.calcit |main
|Phlox-GL/phlox |main
|Quatrefoil-GL/touch-control |main
14 changes: 7 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
{
"version": "0.4.10",
"dependencies": {
"@calcit/procs": "^0.6.0",
"@calcit/procs": "^0.6.26",
"@quamolit/phlox-utils": "^0.0.2",
"@quamolit/touch-control": "^0.0.11",
"bottom-tip": "^0.1.3",
"@quamolit/touch-control": "^0.0.13",
"bottom-tip": "^0.1.5",
"fontfaceobserver-es": "^3.3.3",
"hsluv": "^0.1.0",
"nanoid": "^4.0.0",
"pixi.js": "6.5.0"
"hsluv": "^1.0.0",
"nanoid": "^4.0.2",
"pixi.js": "7.2.4"
},
"devDependencies": {
"mobile-detect": "^1.4.5",
"vite": "^3.0.2"
"vite": "^4.3.3"
}
}
Loading

0 comments on commit 1a5c198

Please sign in to comment.