From 6caed9c773eed089d5d3aa4236485203b8dc62fa Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sun, 9 Feb 2020 16:35:23 -0600
Subject: [PATCH] fix(publish): login and build (#406) [version updates] (#407)

* yarn before pack

* login to cargo to publish

* skip install on same version

* workflow edits trigger too

* and this one too

Co-authored-by: Jacob Bolda <me@jacobbolda.com>
---
 .github/workflows/check-on-push.yml | 24 ++++++++++++++++++++++++
 .github/workflows/release-cargo.yml |  4 ++++
 .github/workflows/release-npm.yml   |  4 ++++
 .github/workflows/test-on-pr.yml    | 16 ----------------
 4 files changed, 32 insertions(+), 16 deletions(-)
 create mode 100644 .github/workflows/check-on-push.yml

diff --git a/.github/workflows/check-on-push.yml b/.github/workflows/check-on-push.yml
new file mode 100644
index 000000000..caccb7ec6
--- /dev/null
+++ b/.github/workflows/check-on-push.yml
@@ -0,0 +1,24 @@
+name: clippy check
+
+on:
+  push:
+    branches-ignore:
+      - master
+      - dev
+
+jobs:
+  clippy_check:
+    runs-on: ubuntu-latest
+    env:
+      TAURI_DIST_DIR: tauri/test/fixture/dist
+      TAURI_DIR: ../test/fixture/src-tauri
+    steps:
+      - uses: actions/checkout@v2
+      - name: install webkit2gtk
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y webkit2gtk-4.0
+      - run: rustup component add clippy
+      - uses: actions-rs/clippy-check@v1
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/release-cargo.yml b/.github/workflows/release-cargo.yml
index 3b5c2e780..9dd068b6d 100644
--- a/.github/workflows/release-cargo.yml
+++ b/.github/workflows/release-cargo.yml
@@ -6,6 +6,7 @@ on:
       - master
     paths:
       - '**/Cargo.toml'
+      - '.github/workflows/**'
 
 jobs:
   publish:
@@ -57,6 +58,9 @@ jobs:
           echo "post package dir:"
           cd ${{ matrix.publishPath }}
           ls
+      - name: cargo login
+        if: env.PACKAGE_VERSION != env.PUBLISHED_VERSION
+        run: cargo login {{ secrets.crate_token }}
       - name: cargo audit
         if: env.PACKAGE_VERSION != env.PUBLISHED_VERSION
         working-directory: ${{ matrix.package.path }}
diff --git a/.github/workflows/release-npm.yml b/.github/workflows/release-npm.yml
index dfe45c518..ddbfd19bf 100644
--- a/.github/workflows/release-npm.yml
+++ b/.github/workflows/release-npm.yml
@@ -6,6 +6,7 @@ on:
       - master
     paths:
       - '**/package.json'
+      - '.github/workflows/**'
 
 jobs:
   publish:
@@ -30,6 +31,9 @@ jobs:
         run: echo ::set-env name=PACKAGE_VERSION::$(node -p "require('./package.json').version")
       - name: check published version
         run: echo ::set-env name=PUBLISHED_VERSION::$(npm view ${{ matrix.package.registryName }} version)
+      - name: yarn install
+        if: env.PACKAGE_VERSION != env.PUBLISHED_VERSION
+        run: yarn
       - name: npm pack
         if: env.PACKAGE_VERSION != env.PUBLISHED_VERSION
         working-directory: ${{ matrix.package.path }}
diff --git a/.github/workflows/test-on-pr.yml b/.github/workflows/test-on-pr.yml
index 814004e17..5144bbd02 100644
--- a/.github/workflows/test-on-pr.yml
+++ b/.github/workflows/test-on-pr.yml
@@ -3,22 +3,6 @@ name: test library
 on: pull_request
 
 jobs:
-  clippy_check:
-    runs-on: ubuntu-latest
-    env:
-      TAURI_DIST_DIR: tauri/test/fixture/dist
-      TAURI_DIR: ../test/fixture/src-tauri
-    steps:
-      - uses: actions/checkout@v2
-      - name: install webkit2gtk
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y webkit2gtk-4.0
-      - run: rustup component add clippy
-      - uses: actions-rs/clippy-check@v1
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-
   build-tauri-core:
     runs-on: ${{ matrix.platform }}