Merge remote-tracking branch 'origin/sdk-1278-dfxvm-install-script' i…

…nto ens/shell-check-formatting
dfinity · Dec 6, 2023 · a79d89b · a79d89b
2 parents e03f8d4 + 8e50744
commit a79d89b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 37 deletions.
diff --git a/.github/workflows/publish-dfxvm-install-script.yml b/.github/workflows/publish-dfxvm-install-script.yml
@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - sdk-1278-dfxvm-install-script
+  pull_request:
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
@@ -17,6 +18,7 @@ env:
 
 jobs:
   publish-manifest:
+    name: dfxvm-install-script-shellcheck
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -37,6 +39,7 @@ jobs:
             s/ *#.*//
           " _out/install.sh
       - name: Upload Artifacts
+        if: github.event_name == 'push'
         uses: JamesIves/github-pages-deploy-action@releases/v3
         with:
           single_commit: yes

diff --git a/.github/workflows/publish-manifest.yml b/.github/workflows/publish-manifest.yml
@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - master
+  pull_request:
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
@@ -17,6 +18,7 @@ env:
 
 jobs:
   publish-manifest:
+    name: install-script-shellcheck:required
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
@@ -38,6 +40,7 @@ jobs:
           " _out/install.sh
           cp public/manifest.json _out/manifest.json
       - name: Upload Artifacts
+        if: github.event_name == 'push'
         uses: JamesIves/github-pages-deploy-action@releases/v3
         with:
           single_commit: yes

diff --git a/src/dfx/.gitignore b/src/dfx/.gitignore