Skip to content

Commit

Permalink
Merge branch 'main' into 2024-11-12-gui-lib-order-operations
Browse files Browse the repository at this point in the history
  • Loading branch information
findolor authored Nov 20, 2024
2 parents 52eea16 + cae4c78 commit ddcee4f
Show file tree
Hide file tree
Showing 7 changed files with 632 additions and 12 deletions.
11 changes: 8 additions & 3 deletions .github/workflows/tauri-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,8 @@ jobs:
- uses: actions/checkout@v4
with:
fetch-depth: 0
submodules: recursive

fetch-depth: 0
- name: Install Nix
uses: DeterminateSystems/nix-installer-action@v4
- uses: DeterminateSystems/magic-nix-cache-action@v2
Expand All @@ -77,10 +76,16 @@ jobs:
- run: nix develop -c rainix-sol-prelude
- run: nix develop -c rainix-rs-prelude
- run: nix develop -c raindex-prelude
- run: nix develop -c npm run build

- run: nix develop .#tauri-shell -c ob-tauri-prelude

- run: nix develop -c npm run build
working-directory: packages/orderbook
- run: nix develop -c npm run build
working-directory: packages/ui-components

- run: nix develop .#tauri-shell -c ob-tauri-unit-test

- run: nix develop .#tauri-shell --command ob-tauri-before-build-ci
working-directory: ./tauri-app
env:
Expand Down
48 changes: 48 additions & 0 deletions .github/workflows/vercel-preview.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
name: GitHub Actions Vercel Preview Deployment
env:
VERCEL_ORG_ID: ${{ secrets.VERCEL_ORG_ID }}
VERCEL_PROJECT_ID: ${{ secrets.VERCEL_PROJECT_ID }}
on:
push:
branches-ignore:
- main
jobs:
Deploy-Preview:
runs-on: ubuntu-latest
env:
COMMIT_SHA: ${{ github.sha }}
steps:
- uses: actions/checkout@v2
with:
submodules: recursive
fetch-depth: 0

- uses: DeterminateSystems/nix-installer-action@main
- uses: DeterminateSystems/magic-nix-cache-action@main

- run: nix develop -c rainix-sol-prelude
working-directory: lib/rain.interpreter
- run: nix develop -c rainix-rs-prelude
working-directory: lib/rain.interpreter
- run: nix develop -c rainix-sol-prelude
working-directory: lib/rain.interpreter/lib/rain.metadata
- run: nix develop -c rainix-rs-prelude
working-directory: lib/rain.interpreter/lib/rain.metadata
- run: nix develop -c rainix-sol-prelude
- run: nix develop -c rainix-rs-prelude
- run: nix develop -c raindex-prelude
- run: nix develop -c npm run build
working-directory: packages/orderbook
- run: nix develop -c npm run build
working-directory: packages/ui-components
- run: nix develop -c npm run build
working-directory: packages/orderbook
- run: nix develop .#webapp-shell -c npm run build
working-directory: packages/webapp

- name: Install Vercel CLI
run: npm install --global vercel@canary
- name: Pull Vercel Environment Information
run: vercel pull --yes --environment=preview --token=${{ secrets.VERCEL_TOKEN }}
- name: Deploy Project Artifacts to Vercel
run: vercel deploy --prebuilt --token=${{ secrets.VERCEL_TOKEN }} packages/webapp
48 changes: 48 additions & 0 deletions .github/workflows/vercel-prod.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
name: GitHub Actions Vercel Production Deployment
env:
VERCEL_ORG_ID: ${{ secrets.VERCEL_ORG_ID }}
VERCEL_PROJECT_ID: ${{ secrets.VERCEL_PROJECT_ID }}
on:
push:
branches:
- main
jobs:
Deploy-Preview:
runs-on: ubuntu-latest
env:
COMMIT_SHA: ${{ github.sha }}
steps:
- uses: actions/checkout@v2
with:
submodules: recursive
fetch-depth: 0

- uses: DeterminateSystems/nix-installer-action@main
- uses: DeterminateSystems/magic-nix-cache-action@main

- run: nix develop -c rainix-sol-prelude
working-directory: lib/rain.interpreter
- run: nix develop -c rainix-rs-prelude
working-directory: lib/rain.interpreter
- run: nix develop -c rainix-sol-prelude
working-directory: lib/rain.interpreter/lib/rain.metadata
- run: nix develop -c rainix-rs-prelude
working-directory: lib/rain.interpreter/lib/rain.metadata
- run: nix develop -c rainix-sol-prelude
- run: nix develop -c rainix-rs-prelude
- run: nix develop -c raindex-prelude
- run: nix develop -c npm run build
working-directory: packages/orderbook
- run: nix develop -c npm run build
working-directory: packages/ui-components
- run: nix develop -c npm run build
working-directory: packages/orderbook
- run: nix develop .#webapp-shell -c npm run build
working-directory: packages/webapp

- name: Install Vercel CLI
run: npm install --global vercel@canary
- name: Pull Vercel Environment Information
run: vercel pull --yes --environment=production --token=${{ secrets.VERCEL_TOKEN }}
- name: Deploy Project Artifacts to Vercel
run: vercel deploy --prebuilt --prod --token=${{ secrets.VERCEL_TOKEN }} packages/webapp
5 changes: 5 additions & 0 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -288,6 +288,11 @@
buildInputs = rainix.devShells.${system}.tauri-shell.buildInputs ++ [pkgs.clang-tools];
nativeBuildInputs = rainix.devShells.${system}.tauri-shell.nativeBuildInputs;
};
devShells.webapp-shell = pkgs.mkShell {
packages = with pkgs; [
nodejs_20
];
};

}
);
Expand Down
Loading

0 comments on commit ddcee4f

Please sign in to comment.