Skip to content

Commit

Permalink
Updated the whole build pipeline
Browse files Browse the repository at this point in the history
  • Loading branch information
notangelmario committed Nov 5, 2023
1 parent 3b65793 commit 3523857
Show file tree
Hide file tree
Showing 7 changed files with 39 additions and 29 deletions.
11 changes: 8 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,17 @@ jobs:
with:
workspaces: './src-tauri -> target'

- name: Setup bun
uses: oven-sh/setup-bun@v1
- name: Setup Node
uses: actions/setup-node@v4
with:
# Version Spec of the version to use in SemVer notation.
# It also emits such aliases as lts, latest, nightly and canary builds
# Examples: 12.x, 10.15.1, >=10.15.0, lts/Hydrogen, 16-nightly, latest, node
node-version: 'lts'

- name: Install frontend dependencies
# If you don't have `beforeBuildCommand` configured you may want to build your frontend here too.
run: bun i # Change this to npm, yarn or pnpm.
run: npm install # Change this to npm, yarn or pnpm.

- name: Build the app
uses: tauri-apps/tauri-action@v0
Expand Down
29 changes: 29 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
name: Test
on: [pull_request]

jobs:
test-tauri:
strategy:
fail-fast: false
matrix:
platform: [macos-latest, ubuntu-20.04, windows-latest]

runs-on: ${{ matrix.platform }}
steps:
- uses: actions/checkout@v4
- name: setup node
uses: actions/setup-node@v4
with:
node-version: 20
- name: install Rust stable
uses: dtolnay/rust-toolchain@stable
- name: install dependencies (ubuntu only)
if: matrix.platform == 'ubuntu-20.04'
run: |
sudo apt-get update
sudo apt-get install -y libgtk-3-dev libwebkit2gtk-4.0-dev libappindicator3-dev librsvg2-dev patchelf
- name: install frontend dependencies
run: npm install # change this to npm or pnpm depending on which one you use
- uses: tauri-apps/tauri-action@v0
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ Marker is a minimalist web editor based on [Monaco Editor](https://microsoft.git
* Good for casual users, good for power users
* Best default settings
* Easy to learn keyboard shortcuts
* Supported on Linux, MacOS and Windows

## 🌐 Languages

Expand Down
1 change: 0 additions & 1 deletion docs/CNAME

This file was deleted.

8 changes: 0 additions & 8 deletions docs/index.html

This file was deleted.

2 changes: 1 addition & 1 deletion src-tauri/tauri.conf.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"$schema": "../node_modules/@tauri-apps/cli/schema.json",
"build": {
"beforeBuildCommand": "bun run build",
"beforeBuildCommand": "npm run build",
"beforeDevCommand": "bun dev",
"devPath": "http://localhost:5173",
"distDir": "../dist"
Expand Down
16 changes: 0 additions & 16 deletions src/app.css
Original file line number Diff line number Diff line change
Expand Up @@ -75,19 +75,3 @@ html, body, #app {
font-size: 12px;
transition: opacity 1s ease-out;
}

/* Unsupported device or browser notice */
#unsupported {
font-family: "Fira Code";
height: 100%;
color: var(--vscode-editor-foreground);
}

#unsupported > div {
display: flex;
flex-flow: column;
justify-content: center;
align-items: center;
text-align: center;
height: 100%;
}

0 comments on commit 3523857

Please sign in to comment.