From 3e7af3df4ec7bd765bb8b09e002bc8e008fc838b Mon Sep 17 00:00:00 2001
From: Jacob Bolda <me@jacobbolda.com>
Date: Mon, 10 Feb 2020 08:05:36 -0600
Subject: [PATCH] fix(publish): touch up npm/cargo publish workflow (#416)
 [version updates]

* skip yarn audit if current package is latest

* escape backticks

* escape backticks
---
 .github/workflows/release-cargo.yml |  8 ++++----
 .github/workflows/release-npm.yml   | 11 ++++++++---
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/release-cargo.yml b/.github/workflows/release-cargo.yml
index d790833dc..0b709573a 100644
--- a/.github/workflows/release-cargo.yml
+++ b/.github/workflows/release-cargo.yml
@@ -73,17 +73,17 @@ jobs:
         run: |
           cargo install cargo-audit
           echo "# Cargo Audit" | tee -a ${{runner.workspace }}/notes.md
-          echo "```" >> ${{runner.workspace }}/notes.md
+          echo "\`\`\`" >> ${{runner.workspace }}/notes.md
           cargo audit 2>&1 | tee -a ${{runner.workspace }}/notes.md
-          echo "```" >> ${{runner.workspace }}/notes.md
+          echo "\`\`\`" >> ${{runner.workspace }}/notes.md
       - name: Publish ${{ matrix.package.name }}
         if: env.PACKAGE_VERSION != env.PUBLISHED_VERSION
         working-directory: ${{ matrix.package.path }}
         run: |
           echo "# Cargo Publish" | tee -a ${{runner.workspace }}/notes.md
-          echo "```" >> ${{runner.workspace }}/notes.md
+          echo "\`\`\`" >> ${{runner.workspace }}/notes.md
           cargo publish --no-verify 2>&1 | tee -a ${{runner.workspace }}/notes.md
-          echo "```" >> ${{runner.workspace }}/notes.md
+          echo "\`\`\`" >> ${{runner.workspace }}/notes.md
       - name: Create Release
         id: create_crate_release
         if: env.PACKAGE_VERSION != env.PUBLISHED_VERSION
diff --git a/.github/workflows/release-npm.yml b/.github/workflows/release-npm.yml
index 3cca08bff..1e4abd00e 100644
--- a/.github/workflows/release-npm.yml
+++ b/.github/workflows/release-npm.yml
@@ -46,11 +46,14 @@ jobs:
           echo "This is current latest:" $PUBLISHED_VERSION
           echo "post pack dir:"
           ls
-      - name: npm audit
+      - name: yarn audit
+        if: env.PACKAGE_VERSION != env.PUBLISHED_VERSION
         working-directory: ${{ matrix.package.path }}
         run: |
-          echo "# NPM Audit Results" | tee -a ${{runner.workspace }}/notes.md
+          echo "# Yarn Audit Results" | tee -a ${{runner.workspace }}/notes.md
+          echo "\`\`\`" >> ${{runner.workspace }}/notes.md
           yarn audit 2>&1 | tee -a ${{runner.workspace }}/notes.md
+          echo "\`\`\`" >> ${{runner.workspace }}/notes.md
       - name: Publish ${{ matrix.package.name }}
         if: env.PACKAGE_VERSION != env.PUBLISHED_VERSION
         working-directory: ${{ matrix.package.path }}
@@ -58,7 +61,9 @@ jobs:
           NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
         run: |
           echo "# NPM Package Publish" | tee -a ${{runner.workspace }}/notes.md
+          echo "\`\`\`" >> ${{runner.workspace }}/notes.md
           npm publish 2>&1 | tee -a ${{runner.workspace }}/notes.md
+          echo "\`\`\`" >> ${{runner.workspace }}/notes.md
       - name: Create Release
         id: create_npm_release
         if: env.PACKAGE_VERSION != env.PUBLISHED_VERSION
@@ -91,4 +96,4 @@ jobs:
           IOTA_SEED: ${{ secrets.IOTA_SEED }}
         with:
           tag_name: ${{ matrix.package.name }}-v${{ env.PACKAGE_VERSION }}
-          comment: "[Test] Release ${{ matrix.package.name }} v${{ env.PACKAGE_VERSION }} [npmjs.com]"
+          comment: "Release ${{ matrix.package.name }} v${{ env.PACKAGE_VERSION }} [npmjs.com]"