Skip to content

Commit

Permalink
chore: merge release-v0.1.10 into main
Browse files Browse the repository at this point in the history
  • Loading branch information
mrjackwills committed Jan 4, 2024
2 parents 74962f6 + fb6920c commit f68492a
Show file tree
Hide file tree
Showing 11 changed files with 1,151 additions and 1,281 deletions.
13 changes: 6 additions & 7 deletions .github/release-body.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
### 2023-11-21
### 2024-01-04

### Chores
+ Rust 1.74.0 linting, [aef90421](https://www.github.com/mrjackwills/obliqoro/commit/aef904215f2c9833b8f7c4675a5486f332578baa)
+ .devcontainer updated, [0fc86d12](https://www.github.com/mrjackwills/obliqoro/commit/0fc86d1292ebf25e1655672a11bc0f685fb80a97)
+ lints moved from main.rs to Cargo.toml, [99e9ff21](https://www.github.com/mrjackwills/obliqoro/commit/99e9ff212869e2ce893cf72402042d1b2c06184c)
+ dependencies updated, [92656b79](https://www.github.com/mrjackwills/obliqoro/commit/92656b7982fa2794f333df60c968e740b3be28f1)
+ dependencies updated, [14ee3caf4129e796a5f1536b7cecbfb1b85c6c28], [0985cf85db5fffe28f9b0184104c7523a4b22423]
+ Rust 1.75.0 linting, [70214a84798b3826790655f9205f7048070d75bd]

### Fixes
+ reduce tick sleep rate from 1000ms to 500ms, [216eb199](https://www.github.com/mrjackwills/obliqoro/commit/216eb1990d533a0803666ab6ecbebcb29cd7e255)
+ GitHub action workflow, [73669e8c752027bc08f849d535cf3e2ce4885abc]
+ tauri.conf description, and allowlist issue, [a3d6ea37c2e5bb0892640b4fcaea45a1e9f75ac0]

see <a href='https://www.github.com/mrjackwills/obliqoro/blob/main/CHANGELOG.md'>CHANGELOG.md</a> for more details
see <a href='https://github.com/mrjackwills/obliqoro/blob/main/CHANGELOG.md'>CHANGELOG.md</a> for more details
102 changes: 81 additions & 21 deletions .github/workflows/create_workflows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,30 @@ name: Release CI
on:
push:
tags:
- 'v[0-9]+.[0-9]+.[0-9]+'

workflow_dispatch:
- "v[0-9]+.[0-9]+.[0-9]+"

jobs:
release:
cross_platform_build:
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
platform: [ubuntu-20.04, windows-latest]
runs-on: ${{ matrix.platform }}
include:
- build: linux
os: ubuntu-latest
arch: x86_64
target: x86_64-unknown-linux-gnu
- build: windows
os: windows-latest
arch: x86_64
target: x86_64-pc-windows-msvc

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

- name: Install dependencies (ubuntu only)
if: matrix.platform == 'ubuntu-20.04'
if: matrix.os == 'ubuntu-latest'
run: |
sudo apt-get update
sudo apt-get install -y libgtk-3-dev libwebkit2gtk-4.0-dev libayatana-appindicator3-dev librsvg2-dev
Expand All @@ -37,21 +44,74 @@ jobs:
node-version: "lts/*"
cache: "npm"

- name: Install app dependencies and build web
run: npm install --force
- name: Install Rust dependencies web
run: cargo install tauri-cli

- name: Install node dependencies
run: npm install

- name: Build
run: cargo tauri build

- uses: actions/upload-artifact@v3
if: matrix.os == 'ubuntu-latest'
with:
name: artifacts-${{ matrix.os }}
path: |
./src-tauri/target/release/bundle/appimage/**.AppImage
./src-tauri/target/release/bundle/deb/**.deb
- uses: actions/upload-artifact@v3
if: matrix.os == 'windows-latest'
with:
name: artifacts-${{ matrix.os }}
path: |
./src-tauri/target/release/bundle/msi/*.msi
###########################
## Build & Create release #
###########################
###################
## Create release #
###################

create_release:
needs: [cross_platform_build]
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v4

- name: Write release version to env
run: |
CURRENT_SEMVER=${GITHUB_REF_NAME#v}
echo "CURRENT_SEMVER=$CURRENT_SEMVER" >> $GITHUB_ENV
- name: Download linux artifacts
uses: actions/download-artifact@v3
with:
name: artifacts-ubuntu-latest
path: artifacts/ubuntu

- name: Download windows artifacts
uses: actions/download-artifact@v3
with:
name: artifacts-windows-latest
path: artifacts/windows

- name: Rename artifacts
run: |
- name: Build the app
uses: tauri-apps/tauri-action@v0
mv "artifacts/ubuntu/deb/obliqoro_${{ env.CURRENT_SEMVER }}_amd64.deb" "artifacts/Obliqoro_linux_x86_64.deb"
mv "artifacts/ubuntu/appimage/obliqoro_${{ env.CURRENT_SEMVER }}_amd64.AppImage" "artifacts/Obliqoro_linux_x86_64.AppImage"
mv "artifacts/windows/Obliqoro_${{ env.CURRENT_SEMVER }}_x64_en-US.msi" "artifacts/Obliqoro_windows_x86_64.msi"
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: Update Release
uses: ncipollo/release-action@v1
with:
tagName: ${{ github.ref_name }} # This only works if your workflow triggers on new tags.
releaseName: 'v__VERSION__' # tauri-action replaces \_\_VERSION\_\_ with the app version.
releaseBody: 'see <a href="https://github.com/mrjackwills/obliqoro/blob/main/CHANGELOG.md">CHANGELOG.md</a> for more details'
releaseDraft: true
prerelease: false
makeLatest: true
name: ${{ github.ref_name }}
tag: ${{ github.ref }}
bodyFile: ".github/release-body.md"
token: ${{ secrets.GITHUB_TOKEN }}
artifacts: |
artifacts/Obliqoro_windows_x86_64.msi
artifacts/Obliqoro_linux_x86_64.deb
artifacts/Obliqoro_linux_x86_64.AppImage
11 changes: 11 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,14 @@
# <a href='https://github.com/mrjackwills/obliqoro/releases/tag/v0.1.10'>v0.1.10</a>
### 2024-01-04

### Chores
+ dependencies updated, [14ee3caf](https://github.com/mrjackwills/obliqoro/commit/14ee3caf4129e796a5f1536b7cecbfb1b85c6c28), [0985cf85](https://github.com/mrjackwills/obliqoro/commit/0985cf85db5fffe28f9b0184104c7523a4b22423)
+ Rust 1.75.0 linting, [70214a84](https://github.com/mrjackwills/obliqoro/commit/70214a84798b3826790655f9205f7048070d75bd)

### Fixes
+ GitHub action workflow, [73669e8c](https://github.com/mrjackwills/obliqoro/commit/73669e8c752027bc08f849d535cf3e2ce4885abc)
+ tauri.conf description, and allowlist issue, [a3d6ea37](https://github.com/mrjackwills/obliqoro/commit/a3d6ea37c2e5bb0892640b4fcaea45a1e9f75ac0)

# <a href='https://www.github.com/mrjackwills/obliqoro/releases/tag/v0.1.9'>v0.1.9</a>
### 2023-11-21

Expand Down
Loading

0 comments on commit f68492a

Please sign in to comment.