Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Coordinator descriptors #24

Merged
merged 13 commits into from
Feb 27, 2024
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
5 changes: 5 additions & 0 deletions .changeset/beige-chefs-poke.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@caravan/clients": patch
---

make sure build files are included in publication
5 changes: 5 additions & 0 deletions .changeset/light-goats-tan.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@caravan/coordinator": minor
---

Implements a UI for using @caravan/descriptors in the coordinator for importing and exporting descriptors. Includes some cleanup to some build processes.
10 changes: 2 additions & 8 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Test
on: [push, pull_request]

jobs:
build:
ci:
runs-on: ubuntu-latest
strategy:
matrix:
Expand All @@ -21,17 +21,11 @@ jobs:
uses: actions/setup-node@v3
with:
node-version: 20

- name: Install wasm-pack
uses: jetli/[email protected]
with:
# Optional version of wasm-pack to install(eg. 'v0.9.1', 'latest')
version: 'latest'
cache: 'npm'

- name: Install Dependencies
run: npm install


- name: Run tests
run: |
npx turbo run ci
17 changes: 3 additions & 14 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
name: Deploy GH Pages

on:
workflow_dispatch:
push:
tags:
- '@caravan/coordinator**'
Expand All @@ -21,23 +22,11 @@ jobs:
- name: Checkout Repo
uses: actions/checkout@v3

- name: Cache Dependencies ...
uses: actions/cache@v1
with:
path: ~/.npm
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
restore-keys: ${{ runner.os }}-node-

- name: Setup Node.js 20
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: 20

- name: Install wasm-pack
uses: jetli/[email protected]
with:
# Optional version of wasm-pack to install(eg. 'v0.9.1', 'latest')
version: 'latest'
cache: 'npm'

- name: Install dependencies
run: npm install
Expand Down
7 changes: 1 addition & 6 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ jobs:
uses: actions/setup-node@v3
with:
node-version: 20
cache: 'npm'

- name: Creating .npmrc
run: |
Expand All @@ -38,12 +39,6 @@ jobs:
env:
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}

- name: Install wasm-pack
uses: jetli/[email protected]
with:
# Optional version of wasm-pack to install(eg. 'v0.9.1', 'latest')
version: 'latest'

- name: Install Dependencies
run: npm install

Expand Down
32 changes: 16 additions & 16 deletions .github/workflows/vercel.yml
Original file line number Diff line number Diff line change
@@ -1,34 +1,34 @@
name: Deploy Vercel

on: [ push, pull_request ]
on:
workflow_dispatch:
push:
branches:
- main
pull_request:
types:
- opened
- synchronize
branches:
- main
paths-ignore:
- '**'

jobs:
vercel:
name: Deploy Vercel
runs-on: ubuntu-latest
if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.event.pull_request.base.repo.full_name

steps:
- name: Checkout Repo
uses: actions/checkout@v3

- name: Cache Dependencies ...
uses: actions/cache@v1
with:
path: ~/.npm
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
restore-keys: ${{ runner.os }}-node-

- name: Setup Node.js 20
uses: actions/setup-node@v3
with:
node-version: 20

- name: Install wasm-pack
uses: jetli/[email protected]
with:
# Optional version of wasm-pack to install (eg. 'v0.9.1', 'latest')
version: 'latest'
cache: 'npm'

- name: Install dependencies
run: npm ci
Expand All @@ -40,7 +40,7 @@ jobs:
# forcing a build to avoid the cache. Probably unnecessary
# but useful in case any environment variables change that might
# impact the build
run: npx turbo run build --force
run: npx turbo run build


- name: Deploy to Staging ...
Expand Down
3 changes: 3 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,9 @@ And another good resource for what the workflow should look like [here](https://

Clone the repo, install all dependencies, and run dev instances of
everything.

(Checkout the README for caravan/descriptors to make sure you can build the wasm dependencies.)

```shell
$ npm install turbo --global
$ git clone https://github.com/caravan-bitcoin/caravan.git
Expand Down
6 changes: 3 additions & 3 deletions apps/coordinator/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ safekeep the addresses (and redeem scripts & BIP32 paths) you create.
Caravan is a stateless pure HTML & JavaScript web application. It can
be run in any web browser from a local or remote installation.

### Unchained Capital GitHub
### Caravan Bitcoin Github

The simplest way to use Caravan is to visit
[https://caravan-bitcoin.github.io/caravan](https://caravan-bitcoin.github.io/caravan),
Expand Down Expand Up @@ -58,7 +58,7 @@ $ git clone https://github.com/caravan-bitcoin/caravan
$ cd caravan
$ npm install
...
$ npm run dev
$ npm run dev:coordinator
...
```

Expand All @@ -73,7 +73,7 @@ application for a production deployment and then host the contents of
the resulting `build` directory via a webserver such as `nginx`.

```bash
$ npm run build
$ npm run build:coordinator
...
```

Expand Down
Loading
Loading