Merge pull request #1 from elstudio/master

Update to actions v2 syntax.

Author: elstudio

.gitignore

@@ -0,0 +1 @@
+.DS_Store

Brewfile

@@ -14,30 +14,32 @@ This repository contains two actions that may be used independently -- typically
 
 An example workflow to run `grunt default` task to build, test, then commit and push any changes back to the GitHub origin repository:
 
-```hcl
-workflow "Grunt compile" {
-  on = "push"
-  resolves = ["Commit and Push"]
-}
-
-action "Build" {
-  uses = "elstudio/actions-js-build/build@master"
-  env = {
-    WD_PATH = "./web/themes/nw8"
-  }
-  args = "default"
-}
-
-action "Commit and Push" {
-  uses = "elstudio/actions-js-build/commit@master"
-  needs = ["Build"]
-  secrets = ["GITHUB_TOKEN"]
-  env = {
-    PUSH_BRANCH = "staging"
-  }
-}
+```yaml
+name: Grunt build and commit updated stylesheets
+
+on: [push]
+
+jobs:
+  grunt-build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v1
+
+    - name: Compile with Grunt
+      uses: elstudio/actions-js-build/build@v2
+      env:
+        WD_PATH: './web/themes/nw8'
+
+    - name: Commit changes
+      uses: elstudio/actions-js-build/commit@v2
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        PUSH_BRANCH: 'staging'
 ```
 
+
 ### Secrets
 
 * `GITHUB_TOKEN` - **Required**. The token to use for authentication with GitHub to commit and push changes back to the origin repository. ([more info](https://developer.github.com/actions/creating-github-actions/accessing-the-runtime-environment/#environment-variables))

README.md

@@ -1,4 +1,4 @@
-FROM node:lts-alpine
+FROM node:10-alpine
 
 LABEL version="1.0.0"
 LABEL repository="https://github.com/elstudio/actions-js-build"

build/Dockerfile

@@ -12,30 +12,32 @@ This Action for [npm](https://www.npmjs.com/) installs any required npm packages
 
 An example workflow to run the `grunt default` task to build, test. The second action commits and pushes any changes back to the GitHub origin repository:
 
-```hcl
-workflow "Grunt compile" {
-  on = "push"
-  resolves = ["Commit and Push"]
-}
-
-action "Build" {
-  uses = "elstudio/actions-js-build/build@master"
-  env = {
-    WD_PATH = "./web/themes/nw8"
-  }
-  args = "default"
-}
-
-action "Commit and Push" {
-  uses = "elstudio/actions-js-build/commit@master"
-  needs = ["Build"]
-  secrets = ["GITHUB_TOKEN"]
-}
-```
 
-### Secrets
+```yaml
+name: Grunt build and commit updated stylesheets
+
+on: [push]
+
+jobs:
+  grunt-build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v1
+
+    - name: Compile with Grunt
+      uses: elstudio/actions-js-build/build@v2
+      env:
+        WD_PATH: './web/themes/nw8'
+
+    - name: Commit changes
+      uses: elstudio/actions-js-build/commit@v2
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        PUSH_BRANCH: 'staging'
+```
 
-* `GITHUB_TOKEN` - **Required**. The token to use for authentication with GitHub to commit and push changes back to the origin repository. ([more info](https://developer.github.com/actions/creating-github-actions/accessing-the-runtime-environment/#environment-variables))
 
 ### Environment variables
 

build/README.md

@@ -0,0 +1,22 @@
+name: 'GitHub Action to execute javascript build tools'
+description: 'Executes npm install, followed by gulp or grunt (whichever has a build file).'
+author: 'elstudio'
+branding:
+  icon: 'truck'
+  color: 'purple'
+inputs: 
+  wdPath:
+    description: 'Working directory path'
+    required: false
+    default: ''
+  debug:
+    description: 'Print script debugging info'
+    required: false
+    default: 'false'
+runs:
+  using: 'docker'
+  image: 'Dockerfile'
+  entrypoint: 'entrypoint.sh'
+  env:
+    DEBUG: ${{ inputs.debug }}
+    WD_PATH: ${{ inputs.wdPath }} 

build/action.yml

@@ -1,8 +1,17 @@
 #!/bin/sh
 
-set -e
+if [ "$DEBUG" == "false" ]
+then
+  # Carry on, but do quit on errors
+  set -e
+else
+  # Verbose debugging
+  set -exuo pipefail
+  export LOG_LEVEL=debug
+fi
+
 
-if [ -n "$WD_PATH" ]
+if [ ! -z "$WD_PATH" ]
 then
   echo "Changing dir to $WD_PATH"
   cd $WD_PATH

build/entrypoint.sh

@@ -1,4 +1,4 @@
-FROM alpine:latest
+FROM alpine:3.10
 
 LABEL version="1.0.0"
 LABEL repository="https://github.com/elstudio/actions-js-build"

commit/.dockerignore

@@ -6,20 +6,30 @@ This Action for git commits any changed files and pushes those changes back to t
 
 An example workflow to commit and push any changes back to the GitHub origin repository:
 
-```hcl
-workflow "Commit and Push" {
-  on = "push"
-  resolves = ["Commit and Push"]
-}
-
-action "Commit and Push" {
-  uses = "elstudio/actions-js-build/commit@master"
-  secrets = ["GITHUB_TOKEN"]
-  env = {
-    WD_PATH = "./web/themes/nw8"
-    PUSH_BRANCH = "staging"
-  }
-}
+
+```yaml
+name: Grunt build and commit updated stylesheets
+
+on: [push]
+
+jobs:
+  grunt-build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v1
+
+    - name: Compile with Grunt
+      uses: elstudio/actions-js-build/build@v2
+      env:
+        WD_PATH: './web/themes/nw8'
+
+    - name: Commit changes
+      uses: elstudio/actions-js-build/commit@v2
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        PUSH_BRANCH: 'staging'
 ```
 
 ### Secrets