Skip to content

Commit

Permalink
Merge branch 'main' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
CheatCod committed May 19, 2023
2 parents 628db0c + 8458952 commit f813a1d
Show file tree
Hide file tree
Showing 4 changed files with 50 additions and 10 deletions.
39 changes: 39 additions & 0 deletions .github/workflows/check.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
name: Cargo Check

on:
workflow_dispatch:
workflow_call:

jobs:
build:
runs-on: ubuntu-latest

defaults:
run:
working-directory: ./src-tauri

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

- name: Install Rust stable
uses: actions-rs/toolchain@v1
with:
toolchain: stable

- name: Install dependencies
run: |
sudo apt-get update
sudo apt-get install -y libgtk-3-dev webkit2gtk-4.0 libappindicator3-dev librsvg2-dev patchelf
- name: Cache Rust Dependencies
uses: Swatinem/rust-cache@v2
with:
workspaces: './src-tauri -> target'
prefix-key: rust-cache
shared-key: ${{ runner.os }}-check
key: 'v1'


- name: Cargo Check
run: cargo check --release
4 changes: 2 additions & 2 deletions .github/workflows/desktop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
default: 'edge'
type: string
debug:
description: 'Whether to build in debug mode'
description: 'Whether to build in debug mode, uses less time but might run out of space on windows'
required: true
default: true
type: boolean
Expand All @@ -26,7 +26,7 @@ on:
default: 'edge'
type: string
debug:
description: 'Whether to build in debug mode'
description: 'Whether to build in debug mode, uses less time but might run out of space on windows'
required: true
default: true
type: boolean
Expand Down
12 changes: 5 additions & 7 deletions .github/workflows/dev.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Developer Preview Workflow
name: Developer Workflow

on:
push:
Expand All @@ -7,9 +7,7 @@ on:

jobs:
lodestone-desktop:
uses: ./.github/workflows/desktop.yml
with:
version: dev
debug: true
release: false
secrets: inherit
runs-on: ubuntu-latest
steps:
- uses: ./.github/workflows/dashboard.yml
- uses: ./.github/workflows/check.yml
5 changes: 4 additions & 1 deletion .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@ jobs:
uses: ./.github/workflows/desktop.yml
with:
version: pr
debug: true
debug: false
release: false
secrets: inherit

lodestone-dashboard:
uses: ./.github/workflows/dashboard.yml

0 comments on commit f813a1d

Please sign in to comment.