Skip to content

Commit ea279e0

Browse files
authored
Merge pull request #1 from EmbarkStudios/impl
First pass implementation
2 parents 8eb77bd + 2fcc7b8 commit ea279e0

File tree

15 files changed

+2185
-67
lines changed

15 files changed

+2185
-67
lines changed

.github/workflows/automerge.yml

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
name: automerge
2+
on:
3+
pull_request:
4+
types:
5+
- labeled
6+
- unlabeled
7+
- synchronize
8+
- opened
9+
- edited
10+
- ready_for_review
11+
- reopened
12+
- unlocked
13+
pull_request_review:
14+
types:
15+
- submitted
16+
status: {}
17+
jobs:
18+
automerge:
19+
runs-on: ubuntu-latest
20+
steps:
21+
- name: automerge
22+
uses: "pascalgn/[email protected]"
23+
env:
24+
GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
25+
MERGE_METHOD: "squash"
26+
LABELS: "!work-in-progress"

.github/workflows/rust-ci.yml

Lines changed: 12 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
name: Test
3737
strategy:
3838
matrix:
39-
os: [ubuntu-latest, windows-latest, macOS-latest]
39+
os: [ubuntu-latest, macOS-latest]
4040
runs-on: ${{ matrix.os }}
4141
steps:
4242
- uses: actions/checkout@v1
@@ -68,7 +68,7 @@ jobs:
6868
- name: download cargo-deny
6969
shell: bash
7070
env:
71-
DVS: 0.3.0-beta
71+
DVS: "0.4.0"
7272
DREPO: EmbarkStudios/cargo-deny
7373
TARGET: x86_64-unknown-linux-musl
7474
run: |
@@ -81,7 +81,6 @@ jobs:
8181
- name: cargo-deny check bans
8282
run: ./cargo-deny -L debug check ban
8383

84-
# Remove this check if you don't publish the crate(s) from this repo
8584
publish-check:
8685
name: Publish Check
8786
runs-on: ubuntu-latest
@@ -95,27 +94,15 @@ jobs:
9594
uses: actions-rs/cargo@v1
9695
with:
9796
command: fetch
98-
- name: copy README
99-
shell: bash
100-
run: |
101-
cp README.md lib
102-
cp README.md cli
103-
- name: cargo publish lib
104-
uses: actions-rs/cargo@v1
105-
with:
106-
command: publish
107-
args: --dry-run --allow-dirty --manifest-path lib/Cargo.toml
108-
- name: cargo publish cli
97+
- name: cargo publish
10998
uses: actions-rs/cargo@v1
11099
with:
111100
command: publish
112-
args: --dry-run --allow-dirty --manifest-path cli/Cargo.toml
101+
args: --dry-run
113102

114-
# Remove this job if you don't publish the crate(s) from this repo
115-
# You must add a crates.io API token to your GH secrets called CRATES_IO_TOKEN
116103
publish:
117104
name: Publish
118-
needs: [test, deny-check, publish-check]
105+
needs: [test, publish-check]
119106
runs-on: ubuntu-latest
120107
if: startsWith(github.ref, 'refs/tags/')
121108
steps:
@@ -135,11 +122,9 @@ jobs:
135122
with:
136123
command: publish
137124

138-
# Remove this job if you don't release binaries
139-
# Replace occurances of $BIN_NAME with the name of your binary
140125
release:
141126
name: Release
142-
needs: [test, deny-check]
127+
needs: [test]
143128
if: startsWith(github.ref, 'refs/tags/')
144129
strategy:
145130
matrix:
@@ -148,20 +133,15 @@ jobs:
148133
- os: ubuntu-latest
149134
rust: stable
150135
target: x86_64-unknown-linux-musl
151-
bin: about-me
152-
# We don't enable the progress feature when targeting
153-
# musl since there are some dependencies on shared libs
154-
features: ""
136+
bin: cargo-about
155137
- os: windows-latest
156138
rust: stable
157139
target: x86_64-pc-windows-msvc
158-
bin: about-me.exe
159-
features: --features=progress
140+
bin: cargo-about.exe
160141
- os: macOS-latest
161142
rust: stable
162143
target: x86_64-apple-darwin
163-
bin: about-me
164-
features: --features=progress
144+
bin: cargo-about
165145
runs-on: ${{ matrix.os }}
166146
steps:
167147
- name: Install stable toolchain
@@ -183,14 +163,13 @@ jobs:
183163
args: --target ${{ matrix.target }}
184164
- name: Release build
185165
uses: actions-rs/cargo@v1
186-
if: matrix.os != 'ubuntu-latest'
187166
with:
188167
command: build
189-
args: --release --target ${{ matrix.target }} ${{ matrix.features }}
168+
args: --release --target ${{ matrix.target }}
190169
- name: Package
191170
shell: bash
192171
run: |
193-
name=about-me
172+
name=cargo-about
194173
tag=$(git describe --tags --abbrev=0)
195174
release_name="$name-$tag-${{ matrix.target }}"
196175
release_tar="${release_name}.tar.gz"
@@ -217,6 +196,6 @@ jobs:
217196
uses: softprops/action-gh-release@v1
218197
with:
219198
draft: true
220-
files: 'about-me*'
199+
files: 'cargo-about*'
221200
env:
222201
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
11
/target
22
**/*.rs.bk
3-
Cargo.lock

CHANGELOG.md

Lines changed: 3 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -6,29 +6,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
66

77
## [Unreleased]
88

9-
## [0.1.1] - 2019-09-03
10-
### Added
11-
- New features go here in a bullet list
12-
13-
### Changed
14-
- Changes to existing functionality go here in a bullet list
15-
16-
### Deprecated
17-
- Mark features soon-to-be removed in a bullet list
18-
19-
### Removed
20-
- Features that have been removed in a bullet list
21-
22-
### Fixed
23-
- Bug fixes in a bullet list
24-
25-
### Security
26-
- Changes/fixes related to security vulnerabilities in a bullet list
27-
28-
## [0.1.0] - 2019-09-02
9+
## [0.0.1] - 2019-11-07
2910
### Added
3011
- Initial add of the thing
3112

32-
[Unreleased]: https://github.com/EmbarkStudios/about-me/compare/0.1.1...HEAD
33-
[0.1.1]: https://github.com/EmbarkStudios/about-me/compare/0.1.0...0.1.1
34-
[0.1.0]: https://github.com/EmbarkStudios/about-me/releases/tag/0.1.0
13+
[Unreleased]: https://github.com/EmbarkStudios/cargo-about/compare/0.0.1...HEAD
14+
[0.0.1]: https://github.com/EmbarkStudios/cargo-about/releases/tag/0.0.1

0 commit comments

Comments
 (0)