Skip to content

Commit

Permalink
Merge pull request #56 from cohstats/master
Browse files Browse the repository at this point in the history
Release 1.2.3
  • Loading branch information
petrvecera authored Aug 22, 2023
2 parents 2325bea + 588edd6 commit bd3bdf3
Show file tree
Hide file tree
Showing 58 changed files with 2,706 additions and 780 deletions.
17 changes: 17 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
root = true

[*]
insert_final_newline = true
charset = utf-8
trim_trailing_whitespace = true
end_of_line = lf

[*.{js,json,ts,tsx}]
indent_style = space
indent_size = 2

[Makefile]
indent_style = tab

[*.{md,markdown}]
trim_trailing_whitespace = false
28 changes: 23 additions & 5 deletions .github/workflows/publish.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,38 @@ on:

jobs:
publish-tauri:
strategy:
fail-fast: false

runs-on: windows-latest
steps:
- uses: actions/checkout@v3
- name: setup node
uses: actions/setup-node@v3
with:
node-version: 16

- name: Cache node modules
uses: actions/cache@v3
env:
cache-name: cache-node-modules-v1
with:
path: |
node_modules
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('yarn.lock') }}
restore-keys: |
${{ runner.os }}-build-${{ env.cache-name }}-
- name: install Rust stable
uses: dtolnay/rust-toolchain@stable
- name: install app dependencies and build it
run: yarn && yarn build

- name: Rust cache
uses: swatinem/rust-cache@v2
with:
workspaces: './src-tauri -> target'

- name: Yarn install FE dependencies
run: yarn --prefer-offline --frozen-lockfile install

- name: Build it
run: yarn build
- uses: tauri-apps/tauri-action@v0
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Expand Down
78 changes: 78 additions & 0 deletions .github/workflows/tests.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
name: 'Tests on PR'
on: [pull_request]

jobs:
js-build-pretier:
name: Check build & Prettier
runs-on: ubuntu-latest

concurrency:
group: tests-${{ github.ref }}
cancel-in-progress: true

steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: '16'

- name: Cache node modules
uses: actions/cache@v3
env:
cache-name: cache-node-modules-v1
with:
path: |
node_modules
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('yarn.lock') }}
restore-keys: |
${{ runner.os }}-build-${{ env.cache-name }}-
- name: Yarn install
run: yarn --prefer-offline --frozen-lockfile install
- name: Check JS build
run: yarn build
- name: Run prettier
run: |
yarn lint:prettier
test-tauri:
name: Test Tauri build
runs-on: windows-latest

concurrency:
group: tests-tauri-build-${{ github.ref }}
cancel-in-progress: true

steps:
- uses: actions/checkout@v3
- name: setup node
uses: actions/setup-node@v3
with:
node-version: 16

- name: Cache node modules
uses: actions/cache@v3
env:
cache-name: cache-node-modules-v1
with:
path: |
node_modules
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('yarn.lock') }}
restore-keys: |
${{ runner.os }}-build-${{ env.cache-name }}-
- name: install Rust stable
uses: dtolnay/rust-toolchain@stable

- name: Rust cache
uses: swatinem/rust-cache@v2
with:
workspaces: './src-tauri -> target'

- name: Yarn install FE dependencies
run: yarn --prefer-offline --frozen-lockfile install
- uses: tauri-apps/tauri-action@v0
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }}
TAURI_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }}
Loading

0 comments on commit bd3bdf3

Please sign in to comment.