Skip to content

Commit

Permalink
Merge branch 'main' into feat/issue10
Browse files Browse the repository at this point in the history
  • Loading branch information
toschoo authored Feb 5, 2024
2 parents 9307976 + 4f2a901 commit 1fa4d42
Show file tree
Hide file tree
Showing 25 changed files with 734 additions and 1,251 deletions.
7 changes: 0 additions & 7 deletions .envrc

This file was deleted.

14 changes: 8 additions & 6 deletions .github/workflows/release.yml → .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -1,20 +1,21 @@
name: "release"
name: "build"
on:
push:
branches:
- main
branches: [ "*" ]
pull_request:
branches: [ "*" ]

# This is the example from the readme.
# On each push to the `main` branch it will create or update a GitHub release, build your app, and upload the artifacts to the release.
# On each push to the `main` branch it will create or update a GitHub build, build your app, and upload the artifacts to the build.

jobs:
release:
build:
permissions:
contents: write
strategy:
fail-fast: false
matrix:
platform: [macos-latest, ubuntu-20.04, windows-latest]
platform: [ macos-latest, ubuntu-20.04, windows-latest ]

runs-on: ${{ matrix.platform }}
steps:
Expand Down Expand Up @@ -58,6 +59,7 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
TAURI_PRIVATE_KEY: ${{ secrets.TAURI_KEY }}
TAURI_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }}
RUSTFLAGS: "--cfg tokio_unstable"
with:
tagName: v__VERSION__ # the action automatically replaces \_\_VERSION\_\_ with the app version
releaseName: "v__VERSION__"
Expand Down
2 changes: 1 addition & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"cSpell.files": ["docs/"]
"cSpell.files": ["docs/", "**/*.md"]
}
Loading

0 comments on commit 1fa4d42

Please sign in to comment.