Merge pull request #11 from linchpin/merge/upstream

chore(NO-JIRA): Updating code scanning
linchpin · Apr 28, 2023 · 17c5712 · 17c5712
2 parents 92c4acd + 15a0892
commit 17c5712
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 50 deletions.
diff --git a/.github/workflows/phpcs.yml b/.github/workflows/phpcs.yml
@@ -1,10 +1,21 @@
 on:
+  push:
+    branches:
+      - main
+      - trunk
+      # Do not run on auto submitted branches
+      - '!**-phpcbf'
+      - '!renovate/**'
+      - '!dependabot/**'
+    paths:
+      - .github/workflows/phpcs.yml
+      - '**.php'
   pull_request:
-    branches-ignore:
+    branches:
       # Do not run on auto submitted branches
-      - '**-phpcbf'
-      - 'renovate/'
-      - 'dependabot/'
+      - '!**-phpcbf'
+      - '!renovate/**'
+      - '!dependabot/**'
     paths:
       - '**.php'
 

diff --git a/.github/workflows/phplint.yml b/.github/workflows/phplint.yml
@@ -1,10 +1,10 @@
 on:
   pull_request:
-    branches-ignore:
+    branches:
       # Do not run on auto submitted branches
-      - '**-phpcbf'
-      - 'renovate/'
-      - 'dependabot/'
+      - '!**-phpcbf'
+      - '!renovate/**'
+      - '!dependabot/**'
     paths:
       - '**.php'
 

diff --git a/.github/workflows/release-please.yml b/.github/workflows/release-please.yml
@@ -70,51 +70,14 @@ jobs:
       - name: Create Sync Zip
         run: |
           cd ./zip
-          zip -r ../linchpin-mmxxiii.zip ./
+          zip -r ../ash.zip ./
           cd ../
 
       - name: Upload files to a GitHub release
         uses: svenstaro/upload-release-action@2.5.0
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
-          file: linchpin-mmxxiii.zip
+          file: ash.zip
           tag: ${{ steps.get_version.outputs.tag }}
-          name: linchpin-mmxxiii.zip
-          overwrite: true
-
-      - name: Configure SSH Connection with WP Engine
-        run: |
-          SSH_PATH="$HOME/.ssh"
-          KNOWN_HOSTS_PATH="$SSH_PATH/known_hosts"
-          SSH_KEY_PRIVATE_PATH="$SSH_PATH/github_action"
-          mkdir -p "$SSH_PATH"
-          ssh-keyscan -t rsa "$SSH_HOST" >> "$KNOWN_HOSTS_PATH"
-          # Copy Secret Keys to container
-          echo "$SSH_KEY" > "$SSH_KEY_PRIVATE_PATH"
-
-          chmod 700 "$SSH_PATH"
-          chmod 644 "$KNOWN_HOSTS_PATH"
-          chmod 600 "$SSH_KEY_PRIVATE_PATH"
-          cat >>~/.ssh/config <<END
-          Host wpengine
-            HostName $SSH_HOST
-            User $SSH_USER
-            IdentityFile $SSH_KEY_PRIVATE_PATH
-            StrictHostKeyChecking no
-          END
-        env:
-          SSH_USER: 'providence'
-          SSH_KEY: ${{ secrets.PRIVATE_KEY }}
-          SSH_HOST: "providence.ssh.wpengine.net"
-
-      - name: Upload Assets
-        id: upload_assets
-        run: |
-          SSH_PATH="$HOME/.ssh"
-          KNOWN_HOSTS_PATH="$SSH_PATH/known_hosts"
-          SSH_KEY_PRIVATE_PATH="$SSH_PATH/github_action"
-          rsync --rsh="ssh -p 22 -i $SSH_KEY_PRIVATE_PATH -o StrictHostKeyChecking=no" -zrxc --progress "./linchpin-mmxxiii.zip" "providence@providence.ssh.wpengine.net:~/sites/providence/_wpeprivate"
-
-      - name: Automatically install release on linchpin.com
-        run: |
-          ssh wpengine "cd ~/sites/providence && wp theme install ~/sites/providence/_wpeprivate/linchpin-mmxxiii.zip --force"
+          name: ash.zip
+          overwrite: true
diff --git a/.github/workflows/wiki.yml b/.github/workflows/wiki.yml
@@ -1,7 +1,7 @@
 on:
   push:
     branches:
-      - main
+      - trunk
     paths:
       - .github/workflows/wiki.yml
       - '**.php'