Merge pull request #1 from EmbarkStudios/impl

First pass implementation
EmbarkStudios · Nov 7, 2019 · ea279e0 · ea279e0
2 parents 8eb77bd + 2fcc7b8
commit ea279e0
Show file tree

Hide file tree

Showing 15 changed files with 2,185 additions and 67 deletions.
diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml
@@ -0,0 +1,26 @@
+name: automerge
+on:
+  pull_request:
+    types:
+      - labeled
+      - unlabeled
+      - synchronize
+      - opened
+      - edited
+      - ready_for_review
+      - reopened
+      - unlocked
+  pull_request_review:
+    types:
+      - submitted
+  status: {}
+jobs:
+  automerge:
+    runs-on: ubuntu-latest
+    steps:
+      - name: automerge
+        uses: "pascalgn/[email protected]"
+        env:
+          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
+          MERGE_METHOD: "squash"
+          LABELS: "!work-in-progress"
diff --git a/.github/workflows/rust-ci.yml b/.github/workflows/rust-ci.yml
@@ -36,7 +36,7 @@ jobs:
     name: Test
     strategy:
       matrix:
-        os: [ubuntu-latest, windows-latest, macOS-latest]
+        os: [ubuntu-latest, macOS-latest]
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v1
@@ -68,7 +68,7 @@ jobs:
     - name: download cargo-deny
       shell: bash
       env:
-        DVS: 0.3.0-beta
+        DVS: "0.4.0"
         DREPO: EmbarkStudios/cargo-deny
         TARGET: x86_64-unknown-linux-musl
       run: |
@@ -81,7 +81,6 @@ jobs:
     - name: cargo-deny check bans
       run: ./cargo-deny -L debug check ban
 
-  # Remove this check if you don't publish the crate(s) from this repo
   publish-check:
     name: Publish Check
     runs-on: ubuntu-latest
@@ -95,27 +94,15 @@ jobs:
       uses: actions-rs/cargo@v1
       with:
         command: fetch
-    - name: copy README
-      shell: bash
-      run: |
-        cp README.md lib
-        cp README.md cli
-    - name: cargo publish lib
-      uses: actions-rs/cargo@v1
-      with:
-        command: publish
-        args: --dry-run --allow-dirty --manifest-path lib/Cargo.toml
-    - name: cargo publish cli
+    - name: cargo publish
       uses: actions-rs/cargo@v1
       with:
         command: publish
-        args: --dry-run --allow-dirty --manifest-path cli/Cargo.toml
+        args: --dry-run
 
-  # Remove this job if you don't publish the crate(s) from this repo
-  # You must add a crates.io API token to your GH secrets called CRATES_IO_TOKEN
   publish:
     name: Publish
-    needs: [test, deny-check, publish-check]
+    needs: [test, publish-check]
     runs-on: ubuntu-latest
     if: startsWith(github.ref, 'refs/tags/')
     steps:
@@ -135,11 +122,9 @@ jobs:
       with:
         command: publish
 
-  # Remove this job if you don't release binaries
-  # Replace occurances of $BIN_NAME with the name of your binary
   release:
     name: Release
-    needs: [test, deny-check]
+    needs: [test]
     if: startsWith(github.ref, 'refs/tags/')
     strategy:
       matrix:
@@ -148,20 +133,15 @@ jobs:
           - os: ubuntu-latest
             rust: stable
             target: x86_64-unknown-linux-musl
-            bin: about-me
-            # We don't enable the progress feature when targeting
-            # musl since there are some dependencies on shared libs
-            features: ""
+            bin: cargo-about
           - os: windows-latest
             rust: stable
             target: x86_64-pc-windows-msvc
-            bin: about-me.exe
-            features: --features=progress
+            bin: cargo-about.exe
           - os: macOS-latest
             rust: stable
             target: x86_64-apple-darwin
-            bin: about-me
-            features: --features=progress
+            bin: cargo-about
     runs-on: ${{ matrix.os }}
     steps:
       - name: Install stable toolchain
@@ -183,14 +163,13 @@ jobs:
           args: --target ${{ matrix.target }}
       - name: Release build
         uses: actions-rs/cargo@v1
-        if: matrix.os != 'ubuntu-latest'
         with:
           command: build
-          args: --release --target ${{ matrix.target }} ${{ matrix.features }}
+          args: --release --target ${{ matrix.target }}
       - name: Package
         shell: bash
         run: |
-          name=about-me
+          name=cargo-about
           tag=$(git describe --tags --abbrev=0)
           release_name="$name-$tag-${{ matrix.target }}"
           release_tar="${release_name}.tar.gz"
@@ -217,6 +196,6 @@ jobs:
         uses: softprops/action-gh-release@v1
         with:
           draft: true
-          files: 'about-me*'
+          files: 'cargo-about*'
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,2 @@
 /target
 **/*.rs.bk
-Cargo.lock
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,29 +6,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
-## [0.1.1] - 2019-09-03
-### Added
-- New features go here in a bullet list
-
-### Changed
-- Changes to existing functionality go here in a bullet list
-
-### Deprecated
-- Mark features soon-to-be removed in a bullet list
-
-### Removed
-- Features that have been removed in a bullet list
-
-### Fixed
-- Bug fixes in a bullet list
-
-### Security
-- Changes/fixes related to security vulnerabilities in a bullet list
-
-## [0.1.0] - 2019-09-02
+## [0.0.1] - 2019-11-07
 ### Added
 - Initial add of the thing
 
-[Unreleased]: https://github.com/EmbarkStudios/about-me/compare/0.1.1...HEAD
-[0.1.1]: https://github.com/EmbarkStudios/about-me/compare/0.1.0...0.1.1
-[0.1.0]: https://github.com/EmbarkStudios/about-me/releases/tag/0.1.0
+[Unreleased]: https://github.com/EmbarkStudios/cargo-about/compare/0.0.1...HEAD
+[0.0.1]: https://github.com/EmbarkStudios/cargo-about/releases/tag/0.0.1