Skip to content

Commit

Permalink
Sawp verso and versoview
Browse files Browse the repository at this point in the history
  • Loading branch information
Legend-Master committed Oct 22, 2024
1 parent 448978c commit edaf211
Show file tree
Hide file tree
Showing 8 changed files with 22 additions and 22 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ jobs:
- name: Fetch Verso version
if: ${{ github.event_name == 'schedule' }}
run: |
echo "VERSO_VERSION=$(cargo metadata --format-version=1 --no-deps | jq -r '.packages[] | select(.name == "verso") | .version')" >> $GITHUB_ENV
echo "VERSO_VERSION=$(cargo metadata --format-version=1 --no-deps | jq -r '.packages[] | select(.name == "versoview") | .version')" >> $GITHUB_ENV
- name: Generate flatpak cargo sources
if: ${{ github.event_name == 'schedule' }}
Expand Down Expand Up @@ -190,7 +190,7 @@ jobs:
- name: Fetch Verso version
if: ${{ github.event_name == 'schedule' }}
run: |
echo "VERSO_VERSION=$(cargo metadata --format-version=1 --no-deps | jq -r '.packages[] | select(.name == "verso") | .version')" >> $Env:GITHUB_ENV
echo "VERSO_VERSION=$(cargo metadata --format-version=1 --no-deps | jq -r '.packages[] | select(.name == "versoview") | .version')" >> $Env:GITHUB_ENV
- name: Upload artifact
if: ${{ github.event_name == 'schedule' }}
Expand Down Expand Up @@ -261,7 +261,7 @@ jobs:
- name: Fetch Verso version
if: ${{ github.event_name == 'schedule' }}
run: |
echo "VERSO_VERSION=$(cargo metadata --format-version=1 --no-deps | jq -r '.packages[] | select(.name == "verso") | .version')" >> $GITHUB_ENV
echo "VERSO_VERSION=$(cargo metadata --format-version=1 --no-deps | jq -r '.packages[] | select(.name == "versoview") | .version')" >> $GITHUB_ENV
- name: Upload artifact
if: ${{ github.event_name == 'schedule' }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/doc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
nix-channel --update nixpkgs
- name: "Build Verso docs"
run: nix-shell shell.nix --run 'cargo doc -p verso --no-deps'
run: nix-shell shell.nix --run 'cargo doc -p versoview --no-deps'

- name: "Remove doc lock file"
run: rm target/doc/.lock
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/release-versoview.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
run: nix-shell shell.nix --run 'cargo build --release'

- name: Make archive
run: nix-shell shell.nix --run 'cd ./target/release && tar -czvf verso-x86_64-unknown-linux-gnu.tar.gz verso'
run: nix-shell shell.nix --run 'cd ./target/release && tar -czvf verso-x86_64-unknown-linux-gnu.tar.gz versoview'

- name: Upload artifact
uses: actions/upload-artifact@v4
Expand Down Expand Up @@ -71,7 +71,7 @@ jobs:

- name: Make archive
working-directory: ./target/release
run: tar -czvf verso-x86_64-pc-windows-msvc.tar.gz verso.exe
run: tar -czvf verso-x86_64-pc-windows-msvc.tar.gz versoview.exe

- name: Upload artifact
uses: actions/upload-artifact@v4
Expand Down Expand Up @@ -110,7 +110,7 @@ jobs:

- name: Make archive
working-directory: ./target/release
run: tar -czvf verso-aarch64-apple-darwin.tar.gz verso
run: tar -czvf verso-aarch64-apple-darwin.tar.gz versoview

- name: Upload artifact
uses: actions/upload-artifact@v4
Expand All @@ -130,7 +130,7 @@ jobs:

- name: Publish release
run: |
RELEASE_TAG=versoview-v$(cargo metadata --format-version=1 --no-deps | jq -r '.packages[] | select(.name == "verso") | .version')
RELEASE_TAG=versoview-v$(cargo metadata --format-version=1 --no-deps | jq -r '.packages[] | select(.name == "versoview") | .version')
git fetch --tags --quiet
if ! git show-ref --tags --verify --quiet "refs/tags/${RELEASE_TAG}" ; then
gh release create ${RELEASE_TAG} ./artifacts/*.tar.gz
Expand Down
18 changes: 9 additions & 9 deletions Cargo.lock

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

4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
[workspace]
members = ["versoview", "versoview_messages"]
members = ["verso", "versoview_messages"]

[workspace.dependencies]
ipc-channel = "0.19"
serde = { version = "1.0", features = ["derive"] }

[package]
name = "verso"
name = "versoview"
version = "0.0.1"
authors = ["Wu Yu Wei"]
edition = "2021"
Expand Down
4 changes: 2 additions & 2 deletions src/main.rs
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
// Prevent console window from appearing on Windows
#![cfg_attr(not(debug_assertions), windows_subsystem = "windows")]

use verso::config::Config;
use verso::{Result, Verso};
use versoview::config::Config;
use versoview::{Result, Verso};
use winit::application::ApplicationHandler;
use winit::event_loop::{self, DeviceEvents};
use winit::event_loop::{EventLoop, EventLoopProxy};
Expand Down
2 changes: 1 addition & 1 deletion versoview/Cargo.toml → verso/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[package]
name = "versoview"
name = "verso"
version = "0.0.1"
edition = "2021"

Expand Down
File renamed without changes.

0 comments on commit edaf211

Please sign in to comment.