bump

.github/workflows/release.yml

@@ -8,11 +8,15 @@ on:
     - 'v[0-9]+.[0-9]+.[0-9]+'
     ## - release
 
+# 1. set up:
+# secrets.COMMITTER_TOKEN - for pushing update to brew tap
+# first placeholder formula in brew tap - for updating
+
+# 2. fill these in and you're done.
 env:
   BIN_NAME: keyscope
   PROJECT_NAME: keyscope
   REPO_NAME: spectralops/keyscope
-  BREW_TAP: spectralops/homebrew-tap
 
 jobs:
   dist:
@@ -21,7 +25,7 @@ jobs:
     strategy:
       fail-fast: false # don't fail other jobs if one fails
       matrix:
-        build: [x86_64-linux, x86_64-macos, x86_64-windows] #, x86_64-win-gnu, win32-msvc aarch64-linux, 
+        build: [x86_64-linux, x86_64-macos, aarch64-macos, x86_64-windows] #, x86_64-win-gnu, win32-msvc aarch64-linux, 
         include:
         - build: x86_64-linux
           os: ubuntu-20.04
@@ -45,6 +49,10 @@ jobs:
           rust: stable
           target: x86_64-pc-windows-msvc
           cross: false
+        - build: aarch64-macos
+          os: macos-latest
+          rust: stable
+          target: aarch64-apple-darwin
         # - build: aarch64-macos
         #   os: macos-latest
         #   rust: stable
@@ -77,6 +85,7 @@ jobs:
         run: sudo apt-get install libssl-dev pkg-config
 
       - name: Run cargo test
+        if: matrix.build != 'aarch64-macos'
         uses: actions-rs/cargo@v1
         with:
           use-cross: ${{ matrix.cross }}
@@ -158,7 +167,7 @@ jobs:
               if [[ $platform =~ "windows" ]]; then
                   exe=".exe"
               fi
-              pkgname=$PROJECT_NAME-$TAG-$platform
+              pkgname=$PROJECT_NAME-$platform
               mkdir tmp/$pkgname
               # cp LICENSE README.md tmp/$pkgname
               mv bins-$platform/$BIN_NAME$exe tmp/$pkgname
@@ -180,39 +189,3 @@ jobs:
           tag: ${{ steps.tagname.outputs.val }}
           overwrite: true
 
-
-      # update homebrew
-
-      - name: Extract version
-        id: extract-version
-        run: |
-          printf "::set-output name=%s::%s\n" tag-name "${GITHUB_REF#refs/tags/}"
-
-      - uses: mislav/bump-homebrew-formula-action@v1
-        with:
-          formula-path: ${{env.PROJECT_NAME}}.rb
-          homebrew-tap: ${{ env.BREW_TAP }}
-          download-url: "https://github.com/${{ env.REPO_NAME }}/releases/download/${{ steps.extract-version.outputs.tag-name }}/${{env.PROJECT_NAME}}-${{ steps.extract-version.outputs.tag-name }}-x86_64-macos.tar.xz"
-          commit-message: updating formula for ${{ env.PROJECT_NAME }}
-        env:
-          COMMITTER_TOKEN: ${{ secrets.COMMITTER_TOKEN }}
-
-
-
-
-        #
-        # you can use this initial file in your homebrew-tap if you don't have an initial formula:
-        # <projectname>.rb
-        #
-        # class <Projectname capitalized> < Formula
-        #   desc "A test formula"
-        #   homepage "http://www.example.com"
-        #   url "-----"
-        #   version "-----"
-        #   sha256 "-----"
-
-        #   def install
-        #     bin.install "<bin-name>"
-        #   end
-        # end
-

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "keyscope"
-version = "1.2.3"
+version = "1.3.0"
 edition = "2018"
 build = "build.rs"
 
@@ -9,16 +9,16 @@ build = "build.rs"
 [dependencies]
 
 clap = "3.0.0-beta.4"
-service_policy_kit="0.7.0"
-serde="*"
-serde_json="*"
-serde_derive="*"
-serde_yaml="*"
-env_logger="*"
-anyhow="*"
-console="*"
-csv="*"
+service_policy_kit = "0.7.0"
+serde = "*"
+serde_json = "*"
+serde_derive = "*"
+serde_yaml = "*"
+env_logger = "*"
+anyhow = "*"
+console = "*"
+csv = "*"
 
 [build-dependencies]
 vergen = "*"
-anyhow="*"
+anyhow = "*"

rustwrap.yaml

@@ -0,0 +1,31 @@
+targets:
+  - platform: win32
+    arch: x64
+    url_template: https://github.com/spectralops/keyscope/releases/download/v__VERSION__/keyscope-x86_64-windows.zip
+  - platform: linux
+    arch: x64
+    url_template: https://github.com/spectralops/keyscope/releases/download/v__VERSION__/keyscope-x86_64-linux.tar.xz
+  - platform: darwin
+    arch: x64
+    url_template: https://github.com/spectralops/keyscope/releases/download/v__VERSION__/keyscope-x86_64-macos.tar.xz
+  - platform: darwin
+    arch: arm64
+    url_template: https://github.com/spectralops/keyscope/releases/download/v__VERSION__/keyscope-aarch64-macos.tar.xz
+brew:
+  name: mm 
+  publish: true
+  tap: spectralops/homebrew-tap
+  recipe_fname: keyscope.rb
+  recipe_template: |
+    class Keyscope < Formula
+      desc "Keyscope is a key and secret workflow (validation, invalidation, etc.) tool built in Rust"
+      homepage "http://github.com/spectralops/keyscope"
+      url "__URL__"
+      version "__VERSION__"
+      sha256 "__SHA__"
+
+      def install
+        bin.install "keyscope"
+      end
+    end
+