Merge branch 'develop' into dependabot/npm_and_yarn/action/json5-2.2.3

.github/workflows/badges.yml

@@ -14,7 +14,7 @@ jobs:
     - name: Use Node.js
       uses: actions/setup-node@main
       with:
-        node-version: 16.x
+        node-version: 20.x
     - run: |
         cd action
         npm install

.github/workflows/ci-pr.yml

@@ -10,7 +10,7 @@ jobs:
     - name: Use Node.js
       uses: actions/setup-node@main
       with:
-        node-version: 16.x
+        node-version: 20.x
     - name: 'Build'
       run: |
         cd action
@@ -21,12 +21,16 @@ jobs:
   unit-tests:
     name: Run Unit Tests
     runs-on: ubuntu-latest
+    # do not run from forks, as forks don’t have access to repository secrets
+    if: github.event.pull_request.head.repo.owner.login == github.event.pull_request.base.repo.owner.login
     steps:
+    - name: Install docker-compose
+      run: sudo apt-get update && sudo apt-get install -y docker-compose
     - uses: actions/checkout@master
     - name: Use Node.js
       uses: actions/setup-node@main
       with:
-        node-version: 16.x
+        node-version: 20.x
     - name: Install NPM Packages
       run: |
         cd action

.github/workflows/ci.yml

@@ -1,10 +1,14 @@
 name: Test branch
-on: push
+on:
+  - push
+  - pull_request
 
 jobs:
   deploy-ssh-no-branch:
     name: Test deploying to a new branch
     runs-on: ubuntu-latest
+    # do not run from forks, as forks don’t have access to repository secrets
+    if: github.event.pull_request.head.repo.owner.login == github.event.pull_request.base.repo.owner.login
     steps:
     - uses: actions/checkout@master
     - name: Setup Dummy Data
@@ -35,6 +39,8 @@ jobs:
   deploy-ssh-existing-branch:
     name: Test deploying to a pre-existing branch
     runs-on: ubuntu-latest
+    # do not run from forks, as forks don’t have access to repository secrets
+    if: github.event.pull_request.head.repo.owner.login == github.event.pull_request.base.repo.owner.login
     steps:
     - uses: actions/checkout@master
     - name: Setup Dummy Data
@@ -52,6 +58,8 @@ jobs:
   deploy-ssh-existing-branch-known_hosts:
     name: Test deploying to a pre-existing branch (with KNOWN_HOSTS_FILE)
     runs-on: ubuntu-latest
+    # do not run from forks, as forks don’t have access to repository secrets
+    if: github.event.pull_request.head.repo.owner.login == github.event.pull_request.base.repo.owner.login
     steps:
     - uses: actions/checkout@master
     - name: Setup Dummy Data
@@ -70,6 +78,8 @@ jobs:
   deploy-ssh-twice:
     name: Test deploying multiple times in one job
     runs-on: ubuntu-latest
+    # do not run from forks, as forks don’t have access to repository secrets
+    if: github.event.pull_request.head.repo.owner.login == github.event.pull_request.base.repo.owner.login
     steps:
     - uses: actions/checkout@master
     - name: Setup Dummy Data
@@ -97,6 +107,8 @@ jobs:
   deploy-locally:
     name: Test deploying to another branch of same repo
     runs-on: ubuntu-latest
+    # do not run from forks, as forks don’t have access to repository secrets
+    if: github.event.pull_request.head.repo.owner.login == github.event.pull_request.base.repo.owner.login
     steps:
     - uses: actions/checkout@master
     - name: Setup Dummy Data

README.md

@@ -118,7 +118,7 @@ jobs:
     - name: Use Node.js
       uses: actions/setup-node@main
       with:
-        node-version: 16.x
+        node-version: 20.x
     - name: npm install and build
       run: |
         npm install
@@ -155,7 +155,7 @@ jobs:
     - name: Use Node.js
       uses: actions/setup-node@main
       with:
-        node-version: 16.x
+        node-version: 20.x
     - name: npm install and build
       run: |
         npm install

action.yml

@@ -3,7 +3,7 @@ name: 'Push git subdirectory as branch'
 description: 'Push a subdirectory as a branch to any git repo over SSH (or to the local repo)'
 author: 'Sam Lanning <sam@samlanning.com>'
 runs:
-  using: 'node16'
+  using: 'node20'
   main: 'action/dist/index.js'
 branding:
   icon: 'upload-cloud'