Skip to content

Commit 2329a1d

Browse files
committed
Merge remote-tracking branch 'upstream/master'
2 parents 177373e + 8c92743 commit 2329a1d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

85 files changed

+7008
-965
lines changed

.github/FUNDING.yml

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
# These are supported funding model platforms
2+
3+
github: cksac
4+
patreon: # Replace with a single Patreon username
5+
open_collective: # Replace with a single Open Collective username
6+
ko_fi: # Replace with a single Ko-fi username
7+
tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
8+
community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
9+
liberapay: # Replace with a single Liberapay username
10+
issuehunt: # Replace with a single IssueHunt username
11+
otechie: # Replace with a single Otechie username
12+
lfx_crowdfunding: # Replace with a single LFX Crowdfunding project-name e.g., cloud-foundry
13+
custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']

.github/workflows/release.yml

+26
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
name: Release
2+
3+
on:
4+
push:
5+
tags:
6+
- "v*.*.*"
7+
8+
jobs:
9+
build_and_release:
10+
runs-on: ubuntu-latest
11+
steps:
12+
- uses: actions/checkout@v2
13+
- uses: actions-rs/cargo@v1
14+
with:
15+
command: build
16+
args: --release --bin fake --features cli
17+
# TODO: Support generating for multiple targets.
18+
# https://stackoverflow.com/questions/73498168/github-actions-merge-artifacts-after-matrix-steps
19+
- name: Archive Binary
20+
run: |
21+
tar cvzf fake-${{ github.ref_name }}-linux-x86_64.tar.gz README.md -C target/release fake
22+
- name: Release
23+
uses: softprops/action-gh-release@v2
24+
with:
25+
files: |
26+
fake-${{ github.ref_name }}-linux-x86_64.tar.gz

.github/workflows/rust.yml

+50-3
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,64 @@ name: Rust
33
on:
44
push:
55
branches: [ master ]
6+
paths:
7+
- "**.rs"
8+
- "**/Cargo.toml"
9+
- ".github/workflows/**"
610
pull_request:
711
branches: [ master ]
12+
paths:
13+
- "**.rs"
14+
- "**/Cargo.toml"
15+
- ".github/workflows/**"
816

917
jobs:
1018
build:
11-
12-
runs-on: ubuntu-latest
13-
19+
strategy:
20+
matrix:
21+
os: [ubuntu-latest, windows-latest, macOS-latest]
22+
rust: [stable]
23+
runs-on: ${{ matrix.os }}
1424
steps:
1525
- uses: actions/checkout@v2
26+
- uses: actions-rs/toolchain@v1
27+
with:
28+
profile: minimal
29+
toolchain: ${{ matrix.rust }}
30+
override: true
1631
- name: Build
1732
run: cargo build --verbose
1833
- name: Run tests
1934
run: cargo test --all-features --verbose
35+
fmt:
36+
name: Rustfmt
37+
runs-on: ubuntu-latest
38+
steps:
39+
- uses: actions/checkout@v2
40+
- uses: actions-rs/toolchain@v1
41+
with:
42+
profile: minimal
43+
toolchain: stable
44+
override: true
45+
- run: rustup component add rustfmt
46+
- uses: actions-rs/cargo@v1
47+
with:
48+
command: fmt
49+
args: --all -- --check
50+
clippy:
51+
name: Clippy
52+
runs-on: ubuntu-latest
53+
steps:
54+
- uses: actions/checkout@v2
55+
- uses: actions-rs/toolchain@v1
56+
with:
57+
profile: minimal
58+
toolchain: stable
59+
override: true
60+
- run: rustup component add clippy
61+
- uses: actions-rs/cargo@v1
62+
with:
63+
command: clippy
64+
args: --workspace --tests --examples -- -D warnings
65+
66+

.gitignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
target
2-
Cargo.lock
32
.idea
3+
Cargo.lock

Cargo.toml

+3-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,6 @@
22
members = [
33
"fake",
44
"dummy_derive",
5-
]
5+
]
6+
7+
resolver = "2"

0 commit comments

Comments
 (0)