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

Project restructure #18

Closed
wants to merge 3 commits into from
Closed
Changes from 1 commit
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
Prev Previous commit
Next Next commit
Project restructure
  • Loading branch information
girogio committed Feb 20, 2024
commit 67df3d8f27a2d61cf9f449d9c7719fd429505fd0
16 changes: 4 additions & 12 deletions .github/workflows/tauri.yml → .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -78,25 +78,21 @@ jobs:
- name: Initialize Rust cache
uses: swatinem/rust-cache@v2
with:
workspaces: './backend -> target'
workspaces: './src-tauri -> target'

- name: Setup Node.js
uses: actions/setup-node@v4
with:
node-version: 20
cache: 'npm'
- run: npm install

- name: Install dependencies (ubuntu only)
if: matrix.platform == 'ubuntu-latest'
run: |
sudo apt-get update
sudo apt-get install -y libsoup-3.0-dev libwebkit2gtk-4.1-dev patchelf javascriptcoregtk-4.1 build-essential curl wget file libgtk-3-dev libayatana-appindicator3-dev librsvg2-dev

- name: Install Tauri CLI
run: |
npm i @tauri-apps/cli@2.0.0-beta.1

# If tagName and releaseId are omitted tauri-action will only build the app and won't try to upload any asstes.
- uses: tauri-apps/tauri-action@v0
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -114,12 +110,8 @@ jobs:
MAINNET_API_OBSCURA: ""
DEVNET_API_OBSCURA: ""
with:
# Use the tauri-cli we installed earlier
tauriScript: cargo tauri
# Build for the ARM architecture on macOS
args: ${{ matrix.platform == 'macos_arm-latest' && ' --target aarch64-apple-darwin' || '' }}
projectPath: backend
distPath: frontend/dist
args: ${{ matrix.platform == 'macos_arm-latest' && ' --target aarch64-apple-darwin' || '' }} # This is required for Apple ARM chips
distPath: dist
# The tagName is alpha for develop, beta for staging and latest for release
includeDebug: ${{ github.ref_name == 'release' && false || true }}
includeRelease: ${{ github.ref_name == 'release' && true || false }}
1 change: 1 addition & 0 deletions .github/workflows/rust-clippy.yml
Original file line number Diff line number Diff line change
@@ -42,6 +42,7 @@ jobs:
run:
cargo clippy
--all-features
--manifest-path=src-tauri/Cargo.toml
--message-format=json | clippy-sarif | tee rust-clippy-results.sarif | sarif-fmt
continue-on-error: true

11 changes: 2 additions & 9 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -51,17 +51,14 @@ jobs:
with:
node-version: 20
cache: 'npm'
- run: npm install

- name: Install dependencies (ubuntu only)
if: matrix.platform == 'ubuntu-latest'
run: |
sudo apt-get update
sudo apt-get install -y libsoup-3.0-dev libwebkit2gtk-4.1-dev patchelf javascriptcoregtk-4.1 build-essential curl wget file libgtk-3-dev libayatana-appindicator3-dev librsvg2-dev

- name: Install Tauri CLI
run: |
npm i @tauri-apps/cli@2.0.0-beta.1

- uses: tauri-apps/tauri-action@v0
env:
TAURI_SIGNING_PRIVATE_KEY: ${{ secrets.TAURI_SIGNING_PRIVATE_KEY}}
@@ -72,8 +69,4 @@ jobs:
MAINNET_API_OBSCURA: ""
DEVNET_API_OBSCURA: ""
with:
# Use the tauri-cli we installed earlier
tauriScript: npm tauri
# Build for the ARM architecture on macOS
projectPath: backend
distPath: frontend/dist
distPath: dist
31 changes: 31 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,34 @@
**/target/
**/node_modules
**/.DS_Store

node_modules/**
dist/**
build/**
.cargo/config.toml

# Logs
logs
*.log
npm-debug.log*
yarn-debug.log*
yarn-error.log*
pnpm-debug.log*
lerna-debug.log*

node_modules
dist
dist-ssr
*.local

# Editor directories and files
.vscode/*
!.vscode/extensions.json
.idea
.DS_Store
*.suo
*.ntvs*
*.njsproj
*.sln
*.sw?
.vscode/*
4 changes: 0 additions & 4 deletions backend/.gitignore

This file was deleted.

Loading
Loading