Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(ci): broken CI & code stuff after project name change #152

Merged
merged 3 commits into from
Jan 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .github/workflows/build_artifacts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,15 +51,15 @@ jobs:
run: mkdir -p bin
- name: Renaming binaries [Windows]
if: matrix.os == 'windows-latest'
run: mv target/release/uad_gui.exe bin/uad_gui-${{ matrix.build_target }}${{ matrix.renderer }}.exe
run: mv target/release/uad-ng.exe bin/uad-ng-${{ matrix.build_target }}${{ matrix.renderer }}.exe
- name: Renaming binaries [Others]
if: matrix.os != 'windows-latest'
run: mv target/release/uad_gui bin/uad_gui${{ matrix.update_name }}-${{ matrix.build_target }}${{ matrix.renderer }}
run: mv target/release/uad-ng bin/uad-ng${{ matrix.update_name }}-${{ matrix.build_target }}${{ matrix.renderer }}
- name: Tarball Linux/MacOS binary
if: matrix.os != 'windows-latest'
run: tar -czf bin/uad_gui${{ matrix.update_name }}-${{ matrix.build_target }}${{ matrix.renderer }}{.tar.gz,}
run: tar -czf bin/uad-ng${{ matrix.update_name }}-${{ matrix.build_target }}${{ matrix.renderer }}{.tar.gz,}
- name: Upload artifacts
uses: actions/upload-artifact@v3
with:
name: uad_gui${{ matrix.update_name }}-${{ matrix.build_target }}${{ matrix.renderer }}
path: bin/uad_gui-*
name: uad-ng${{ matrix.update_name }}-${{ matrix.build_target }}${{ matrix.renderer }}
path: bin/uad-ng-*
16 changes: 8 additions & 8 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@ name: Continuous Integration
on:
push:
paths:
- "**.rs"
- "Cargo.lock"
- "Cargo.toml"
- "**.json"
- Cargo.lock
- Cargo.toml
- resources/assets/*.ttf
- src/**
pull_request:
paths:
- "**.rs"
- "Cargo.lock"
- "Cargo.toml"
- "**.json"
- Cargo.lock
- Cargo.toml
- resources/assets/*.ttf
- src/**

jobs:
lint:
Expand Down
13 changes: 7 additions & 6 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,10 @@ on:
branches:
- main
paths:
- "**.rs"
- "Cargo.lock"
- "Cargo.toml"
- Cargo.lock
- Cargo.toml
- resources/assets/*.ttf
- src/**
tags-ignore:
- dev-build

Expand All @@ -18,6 +19,7 @@ jobs:
build:
uses: ./.github/workflows/build_artifacts.yml
release:
if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/')
runs-on: ubuntu-latest
needs: build
permissions:
Expand All @@ -29,11 +31,10 @@ jobs:
with:
path: bin
- name: Create pre-release
if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/')
uses: softprops/action-gh-release@v1
with:
body_path: ${{ github.workspace }}/CHANGELOG.md
files: bin/*/uad_gui-*
files: bin/*/uad-ng-*
prerelease: true
# - name: Update dev-build tag
# if: ${{ github.event_name == 'push' }}
Expand All @@ -47,6 +48,6 @@ jobs:
# uses: softprops/action-gh-release@v1
# with:
# generate_release_notes: true
# files: bin/*/uad_gui-*
# files: bin/*/uad-ng-*
# prerelease: true
# tag_name: ${{ env.dev_tag }}
6 changes: 3 additions & 3 deletions src/core/update.rs
Original file line number Diff line number Diff line change
Expand Up @@ -229,17 +229,17 @@ pub fn extract_binary_from_tar(archive_path: &Path, temp_file: &Path) -> io::Res
pub const fn bin_name() -> &'static str {
#[cfg(target_os = "windows")]
{
"uad_gui.exe"
"uad-ng.exe"
}

#[cfg(target_os = "macos")]
{
"uad_gui-macos"
"uad-ng-macos"
}

#[cfg(not(any(target_os = "macos", target_os = "windows")))]
{
"uad_gui-linux"
"uad-ng-linux"
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/core/utils.rs
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ pub fn string_to_theme(theme: &str) -> Theme {
}

pub fn setup_uad_dir(dir: Option<PathBuf>) -> PathBuf {
let dir = dir.unwrap().join("uad-ng");
let dir = dir.unwrap().join("uad");
fs::create_dir_all(&dir).expect("Can't create cache directory");
dir
}
Expand Down
6 changes: 4 additions & 2 deletions src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -57,13 +57,15 @@ pub fn setup_logger() -> Result<(), fern::InitError> {
let file_dispatcher = fern::Dispatch::new()
.format(make_formatter(false))
.level(default_log_level)
.level_for("uad_gui", log::LevelFilter::Debug)
// Rust compiler makes module names use _ instead of -
.level_for("uad_ng", log::LevelFilter::Debug)
.chain(log_file);

let stdout_dispatcher = fern::Dispatch::new()
.format(make_formatter(true))
.level(default_log_level)
.level_for("uad_gui", log::LevelFilter::Warn)
// Rust compiler makes module names use _ instead of -
.level_for("uad_ng", log::LevelFilter::Warn)
.chain(std::io::stdout());

fern::Dispatch::new()
Expand Down