Skip to content

Commit

Permalink
Prep for v1.1.0
Browse files Browse the repository at this point in the history
  • Loading branch information
breadthe committed Feb 23, 2023
1 parent bba84ae commit 7ca6559
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 20 deletions.
20 changes: 4 additions & 16 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ name: Release
on:
push:
tags:
# - 'v[0-9]+.[0-9]+.[0-9]+'
- 'v*.*.*'
workflow_dispatch:

Expand Down Expand Up @@ -53,7 +52,7 @@ jobs:

- name: Install app dependencies and build web
# Remove `&& yarn build` if you build your frontend in `beforeBuildCommand`
run: npm install # yarn && yarn build
run: npm ci && npm run build # yarn && yarn build (npm ci = Clean Install)

- name: Build the app
uses: tauri-apps/tauri-action@v0
Expand Down Expand Up @@ -101,19 +100,6 @@ jobs:
path: package.json
prop_path: version

# Mac
# - name: Upload the mac installer asset
# if: runner.os == 'macOS'
# uses: actions/upload-release-asset@v1.0.2
# env:
# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
# with:
# node-version: 16
# upload_url: ${{steps.get_upload_url.outputs.url}}
# asset_path: ./src-tauri/target/release/upload/seismic-${{steps.version.outputs.prop}}-macos-x64.dmg
# asset_name: seismic-${{steps.version.outputs.prop}}-macos-x64.dmg
# asset_content_type: application/octet-stream

# Mac
- name: Upload the mac installer asset
# if: ${{ runner.os == 'macOS' && startsWith(github.ref, 'refs/tags/') }}
Expand All @@ -123,7 +109,9 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
# files: seismic-${{steps.version.outputs.prop}}-macos-x64.dmg
files: ./src-tauri/target/release/upload/seismic-${{steps.version.outputs.prop}}-macos-x64.dmg
files: |
./src-tauri/target/release/upload/seismic-${{steps.version.outputs.prop}}-macos-x64.dmg
./src-tauri/target/release/upload/silicon/seismic-${{steps.version.outputs.prop}}-macos-aarch64.dmg
# body_path: ${{ github.workspace }}-CHANGELOG.txt

# Windows
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "seismic",
"private": true,
"version": "1.0.1",
"version": "1.1.0",
"type": "module",
"scripts": {
"dev": "vite",
Expand Down
2 changes: 1 addition & 1 deletion src-tauri/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src-tauri/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "seismic"
version = "1.0.1"
version = "1.1.0"
description = "USGS earthquake tracker (unofficial)"
authors = ["breadthe"]
license = "MIT"
Expand Down
2 changes: 1 addition & 1 deletion src-tauri/tauri.conf.json
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
"updater": {
"active": true,
"dialog": true,
"endpoints": ["https://gist.github.com/breadthe/1308a67a2363ffb4fdd96f1e1e7c4dd5/raw"],
"endpoints": ["https://gist.github.com/breadthe/2e6cdb44e4ae43a05b580542883553b6/raw"],
"pubkey": "dW50cnVzdGVkIGNvbW1lbnQ6IG1pbmlzaWduIHB1YmxpYyBrZXk6IDE2REVERTUyNTVDRTc3ODMKUldTRGQ4NVZVdDdlRm5NUm1sSFdLMXhiRHgwbHFXVy9jc09ub0FIMkNaQnZkMVUxV1VhSkg3NncK"
},
"windows": [
Expand Down

0 comments on commit 7ca6559

Please sign in to comment.