Skip to content
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
15 changes: 5 additions & 10 deletions .github/workflows/artifacts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -161,26 +161,21 @@ jobs:
with:
fetch-depth: 0

- name: Setup .NET
uses: actions/setup-dotnet@v3
with:
dotnet-version: 8.0.x
- name: Setup Rust
uses: actions-rust-lang/setup-rust-toolchain@v1

- name: Clean
run: dotnet clean --configuration Release && dotnet nuget locals all --clear

- name: Install dependencies
run: dotnet restore -r "${{ matrix.target}}"
run: cargo clean

- name: Build
shell: bash
run: |
# Define some variables for things we need
release_name="mkchap-${{ inputs.release_version }}-${{ matrix.target }}"
echo "RELEASE_NAME=${release_name}" >> $GITHUB_ENV

# Build everything
dotnet publish MkChap.csproj --framework net8.0 --runtime "${{ matrix.target }}" -c Release -o "$release_name" -p:InformationalVersion="${{ inputs.release_version }}-${{ matrix.target }}" -p:EnableCompressionInSingleFile=true -p:DebugType=Embedded -p:PublishSingleFile=true --self-contained true
cargo build --release
mv target/release/mkchap "$release_name/"

# Pack files
if [ "${{ matrix.kind }}" == "windows" ]; then
Expand Down
20 changes: 10 additions & 10 deletions .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,19 @@ jobs:
- name: Get the sources
uses: actions/checkout@v4

- name: Setup .NET
uses: actions/setup-dotnet@v3
- name: Setup Rust
uses: actions-rust-lang/setup-rust-toolchain@v1
with:
dotnet-version: 8.0.x
components: rustfmt

- name: Clean
run: dotnet clean --configuration Release && dotnet nuget locals all --clear
- name: Rustfmt Check
uses: actions-rust-lang/rustfmt@v1

- name: Install dependencies
run: dotnet restore
- name: Clean
run: cargo clean

- name: Build
run: dotnet build --configuration Release --no-restore
run: cargo build

# - name: Test
# run: dotnet test --no-restore --verbosity normal
- name: Test
run: cargo test
39 changes: 2 additions & 37 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,37 +1,2 @@
*.swp
*.*~
project.lock.json
.DS_Store
*.pyc
nupkg/

# Visual Studio Code
.vscode

# Rider
.idea

# User-specific files
*.suo
*.user
*.userosscache
*.sln.docstates

# Build results
[Dd]ebug/
[Dd]ebugPublic/
[Rr]elease/
[Rr]eleases/
x64/
x86/
build/
bld/
[Bb]in/
[Oo]bj/
[Oo]ut/
msbuild.log
msbuild.err
msbuild.wrn

# Visual Studio 2015
.vs/
/target
/.idea
45 changes: 0 additions & 45 deletions BlackDetect.cs

This file was deleted.

249 changes: 249 additions & 0 deletions Cargo.lock

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

Loading