Compare commits

..

7 Commits
v3 ... v4.0.0

Author SHA1 Message Date
Federico Grandi
45c7fd7a48 Commit dist files 2020-03-03 19:32:47 +01:00
Federico Grandi
06fd39b8b7 Fix typo 2020-03-03 19:31:46 +01:00
Federico Grandi
f278ec6d47 Trigger workflow run 2020-03-03 19:30:13 +01:00
Federico Grandi
5a3f4c1c24 Update build workflow 2020-03-03 19:29:21 +01:00
Federico Grandi
602bf4ea71 Final adjustments for v4 2020-03-03 19:28:06 +01:00
Federico Grandi
5148cf0f38 Use set -u instead of -eu 2020-03-03 19:04:22 +01:00
Federico Grandi
12febc42d8 Use git add 2020-03-03 18:36:41 +01:00
27 changed files with 73 additions and 103 deletions

View File

@@ -3,6 +3,8 @@ on:
push:
branches-ignore:
- dist
paths:
- src/**
jobs:
build:

View File

@@ -10,8 +10,12 @@ This action lets you choose the path that you want to use when adding & committi
Add a step like this to your workflow:
```yaml
- uses: EndBug/add-and-commit@v2 # You can change this to use a specific version
- uses: EndBug/add-and-commit@v4 # You can change this to use a specific version
with:
# The arguments for the git add command (see the paragraph below for more info)
# Default: '.'
add: 'src'
# The name of the user that will be displayed as the author of the commit
# Default: author of the commit that triggered the run
author_name: Your Name
@@ -32,15 +36,7 @@ Add a step like this to your workflow:
# Default: 'Commit from GitHub Actions'
message: 'Your commit message'
# The path to stage files from
# Default: '.'
path: 'src'
# The pattern that mathces file names
# Default: '*.*'
pattern: "*.js"
# The files to remove
# The arguments for the git rm command (see the paragraph below for more info)
# Default: ''
remove: "./dir/old_file.js"
@@ -54,9 +50,15 @@ Add a step like this to your workflow:
The only `env` variable required is the token for the action to run: GitHub generates one automatically, but you need to pass it through `env` to make it available to actions. You can find more about `GITHUB_TOKEN` [here](https://help.github.com/en/articles/virtual-environments-for-github-actions#github_token-secret).
With that said, you can just copy the example line and don't worry about it. If you do want to use a different token you can pass that in, but I wouldn't see any possible advantage in doing so.
### Adding files:
The action adds files using a regular `git add` command, so you can put every kind of argument in the `add` option. For example, if you don't want it to use a recursive behavior: `$(find . -maxdepth 1 -name *.js)`.
The script will not stop if one the git commands fails. E.g.: if your command shows a "fatal: pathspec 'yourFile' did not match any files" error the action will go on.
### Deleting files:
You can delete files with the `remove` option: that runs a `git remove` command that will stage the files in the given path for removal. Please keep in mind that if the path is wrong the action will stop.
You can delete files with the `remove` option: that runs a `git rm` command that will stage the files in the given path for removal.
The script will not stop if one the git commands fails. E.g.: if your command shows a "fatal: pathspec 'yourFile' did not match any files" error the action will go on.
### Examples:
@@ -86,13 +88,12 @@ jobs:
run: eslint "src/**" --fix
- name: Commit changes
uses: EndBug/add-and-commit@v2
uses: EndBug/add-and-commit@v4
with:
author_name: Your Name
author_email: mail@example.com
message: "Your commit message"
path: "."
pattern: "*.js"
add: "*.js"
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
```
@@ -118,11 +119,10 @@ jobs:
- run: echo "123" > ./pathToRepo/file.txt
# ...and then use the action as you would normally do, but providing the path to the repo
- uses: EndBug/add-and-commit@v2
- uses: EndBug/add-and-commit@v4
with:
message: "Add the very useful text file"
path: "."
pattern: "*.txt"
add: "*.txt"
cwd: "./pathToRepo/"
force: true
env:

View File

@@ -2,6 +2,10 @@ name: Add & Commit
description: Add & commit files from a path directly from GitHub Actions
inputs:
add:
description: Arguments for the git add command
required: false
default: "."
author_name:
description: The name of the user that will be displayed as the author of the commit
required: false
@@ -20,16 +24,8 @@ inputs:
description: The message for the commit
required: false
default: Commit from GitHub Actions
path:
description: The path to stage files from
required: false
default: "."
pattern:
description: The pattern that mathces file names
required: false
default: "*.*"
remove:
description: The files to remove
description: Arguments for the git rm command
required: false
default: ""

2
node_modules/.bin/shjs generated vendored
View File

@@ -2,7 +2,7 @@
basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
case `uname` in
*CYGWIN*|*MINGW*|*MSYS*) basedir=`cygpath -w "$basedir"`;;
*CYGWIN*) basedir=`cygpath -w "$basedir"`;;
esac
if [ -x "$basedir/node" ]; then

22
node_modules/.bin/shjs.cmd generated vendored
View File

@@ -1,17 +1,7 @@
@ECHO off
SETLOCAL
CALL :find_dp0
IF EXIST "%dp0%\node.exe" (
SET "_prog=%dp0%\node.exe"
@IF EXIST "%~dp0\node.exe" (
"%~dp0\node.exe" "%~dp0\..\shelljs\bin\shjs" %*
) ELSE (
SET "_prog=node"
SET PATHEXT=%PATHEXT:;.JS;=;%
)
"%_prog%" "%dp0%\..\shelljs\bin\shjs" %*
ENDLOCAL
EXIT /b %errorlevel%
:find_dp0
SET dp0=%~dp0
EXIT /b
@SETLOCAL
@SET PATHEXT=%PATHEXT:;.JS;=;%
node "%~dp0\..\shelljs\bin\shjs" %*
)

18
node_modules/.bin/shjs.ps1 generated vendored
View File

@@ -1,18 +0,0 @@
#!/usr/bin/env pwsh
$basedir=Split-Path $MyInvocation.MyCommand.Definition -Parent
$exe=""
if ($PSVersionTable.PSVersion -lt "6.0" -or $IsWindows) {
# Fix case when both the Windows and Linux builds of Node
# are installed in the same directory
$exe=".exe"
}
$ret=0
if (Test-Path "$basedir/node$exe") {
& "$basedir/node$exe" "$basedir/../shelljs/bin/shjs" $args
$ret=$LASTEXITCODE
} else {
& "node$exe" "$basedir/../shelljs/bin/shjs" $args
$ret=$LASTEXITCODE
}
exit $ret

View File

@@ -2,7 +2,7 @@
"_args": [
[
"@actions/core@1.2.0",
"C:\\GitHub\\add-and-commit"
"C:\\EndBug\\GitHub\\add-and-commit"
]
],
"_from": "@actions/core@1.2.0",
@@ -27,7 +27,7 @@
],
"_resolved": "https://registry.npmjs.org/@actions/core/-/core-1.2.0.tgz",
"_spec": "1.2.0",
"_where": "C:\\GitHub\\add-and-commit",
"_where": "C:\\EndBug\\GitHub\\add-and-commit",
"bugs": {
"url": "https://github.com/actions/toolkit/issues"
},

View File

@@ -2,7 +2,7 @@
"_args": [
[
"balanced-match@1.0.0",
"C:\\GitHub\\add-and-commit"
"C:\\EndBug\\GitHub\\add-and-commit"
]
],
"_from": "balanced-match@1.0.0",
@@ -26,7 +26,7 @@
],
"_resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
"_spec": "1.0.0",
"_where": "C:\\GitHub\\add-and-commit",
"_where": "C:\\EndBug\\GitHub\\add-and-commit",
"author": {
"name": "Julian Gruber",
"email": "mail@juliangruber.com",

View File

@@ -2,7 +2,7 @@
"_args": [
[
"brace-expansion@1.1.11",
"C:\\GitHub\\add-and-commit"
"C:\\EndBug\\GitHub\\add-and-commit"
]
],
"_from": "brace-expansion@1.1.11",
@@ -26,7 +26,7 @@
],
"_resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
"_spec": "1.1.11",
"_where": "C:\\GitHub\\add-and-commit",
"_where": "C:\\EndBug\\GitHub\\add-and-commit",
"author": {
"name": "Julian Gruber",
"email": "mail@juliangruber.com",

View File

@@ -2,7 +2,7 @@
"_args": [
[
"concat-map@0.0.1",
"C:\\GitHub\\add-and-commit"
"C:\\EndBug\\GitHub\\add-and-commit"
]
],
"_from": "concat-map@0.0.1",
@@ -26,7 +26,7 @@
],
"_resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
"_spec": "0.0.1",
"_where": "C:\\GitHub\\add-and-commit",
"_where": "C:\\EndBug\\GitHub\\add-and-commit",
"author": {
"name": "James Halliday",
"email": "mail@substack.net",

View File

@@ -2,7 +2,7 @@
"_args": [
[
"fs.realpath@1.0.0",
"C:\\GitHub\\add-and-commit"
"C:\\EndBug\\GitHub\\add-and-commit"
]
],
"_from": "fs.realpath@1.0.0",
@@ -27,7 +27,7 @@
],
"_resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
"_spec": "1.0.0",
"_where": "C:\\GitHub\\add-and-commit",
"_where": "C:\\EndBug\\GitHub\\add-and-commit",
"author": {
"name": "Isaac Z. Schlueter",
"email": "i@izs.me",

4
node_modules/glob/package.json generated vendored
View File

@@ -2,7 +2,7 @@
"_args": [
[
"glob@7.1.4",
"C:\\GitHub\\add-and-commit"
"C:\\EndBug\\GitHub\\add-and-commit"
]
],
"_from": "glob@7.1.4",
@@ -27,7 +27,7 @@
],
"_resolved": "https://registry.npmjs.org/glob/-/glob-7.1.4.tgz",
"_spec": "7.1.4",
"_where": "C:\\GitHub\\add-and-commit",
"_where": "C:\\EndBug\\GitHub\\add-and-commit",
"author": {
"name": "Isaac Z. Schlueter",
"email": "i@izs.me",

4
node_modules/inflight/package.json generated vendored
View File

@@ -2,7 +2,7 @@
"_args": [
[
"inflight@1.0.6",
"C:\\GitHub\\add-and-commit"
"C:\\EndBug\\GitHub\\add-and-commit"
]
],
"_from": "inflight@1.0.6",
@@ -27,7 +27,7 @@
],
"_resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
"_spec": "1.0.6",
"_where": "C:\\GitHub\\add-and-commit",
"_where": "C:\\EndBug\\GitHub\\add-and-commit",
"author": {
"name": "Isaac Z. Schlueter",
"email": "i@izs.me",

4
node_modules/inherits/package.json generated vendored
View File

@@ -2,7 +2,7 @@
"_args": [
[
"inherits@2.0.4",
"C:\\GitHub\\add-and-commit"
"C:\\EndBug\\GitHub\\add-and-commit"
]
],
"_from": "inherits@2.0.4",
@@ -27,7 +27,7 @@
],
"_resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
"_spec": "2.0.4",
"_where": "C:\\GitHub\\add-and-commit",
"_where": "C:\\EndBug\\GitHub\\add-and-commit",
"browser": "./inherits_browser.js",
"bugs": {
"url": "https://github.com/isaacs/inherits/issues"

View File

@@ -2,7 +2,7 @@
"_args": [
[
"interpret@1.2.0",
"C:\\GitHub\\add-and-commit"
"C:\\EndBug\\GitHub\\add-and-commit"
]
],
"_from": "interpret@1.2.0",
@@ -26,7 +26,7 @@
],
"_resolved": "https://registry.npmjs.org/interpret/-/interpret-1.2.0.tgz",
"_spec": "1.2.0",
"_where": "C:\\GitHub\\add-and-commit",
"_where": "C:\\EndBug\\GitHub\\add-and-commit",
"author": {
"name": "Gulp Team",
"email": "team@gulpjs.com",

View File

@@ -2,7 +2,7 @@
"_args": [
[
"minimatch@3.0.4",
"C:\\GitHub\\add-and-commit"
"C:\\EndBug\\GitHub\\add-and-commit"
]
],
"_from": "minimatch@3.0.4",
@@ -28,7 +28,7 @@
],
"_resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
"_spec": "3.0.4",
"_where": "C:\\GitHub\\add-and-commit",
"_where": "C:\\EndBug\\GitHub\\add-and-commit",
"author": {
"name": "Isaac Z. Schlueter",
"email": "i@izs.me",

4
node_modules/once/package.json generated vendored
View File

@@ -2,7 +2,7 @@
"_args": [
[
"once@1.4.0",
"C:\\GitHub\\add-and-commit"
"C:\\EndBug\\GitHub\\add-and-commit"
]
],
"_from": "once@1.4.0",
@@ -28,7 +28,7 @@
],
"_resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
"_spec": "1.4.0",
"_where": "C:\\GitHub\\add-and-commit",
"_where": "C:\\EndBug\\GitHub\\add-and-commit",
"author": {
"name": "Isaac Z. Schlueter",
"email": "i@izs.me",

View File

@@ -2,7 +2,7 @@
"_args": [
[
"path-is-absolute@1.0.1",
"C:\\GitHub\\add-and-commit"
"C:\\EndBug\\GitHub\\add-and-commit"
]
],
"_from": "path-is-absolute@1.0.1",
@@ -27,7 +27,7 @@
],
"_resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
"_spec": "1.0.1",
"_where": "C:\\GitHub\\add-and-commit",
"_where": "C:\\EndBug\\GitHub\\add-and-commit",
"author": {
"name": "Sindre Sorhus",
"email": "sindresorhus@gmail.com",

View File

@@ -2,7 +2,7 @@
"_args": [
[
"path-parse@1.0.6",
"C:\\GitHub\\add-and-commit"
"C:\\EndBug\\GitHub\\add-and-commit"
]
],
"_from": "path-parse@1.0.6",
@@ -26,7 +26,7 @@
],
"_resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz",
"_spec": "1.0.6",
"_where": "C:\\GitHub\\add-and-commit",
"_where": "C:\\EndBug\\GitHub\\add-and-commit",
"author": {
"name": "Javier Blanco",
"email": "http://jbgutierrez.info"

4
node_modules/rechoir/package.json generated vendored
View File

@@ -2,7 +2,7 @@
"_args": [
[
"rechoir@0.6.2",
"C:\\GitHub\\add-and-commit"
"C:\\EndBug\\GitHub\\add-and-commit"
]
],
"_from": "rechoir@0.6.2",
@@ -26,7 +26,7 @@
],
"_resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz",
"_spec": "0.6.2",
"_where": "C:\\GitHub\\add-and-commit",
"_where": "C:\\EndBug\\GitHub\\add-and-commit",
"author": {
"name": "Tyler Kellen",
"url": "http://goingslowly.com/"

4
node_modules/resolve/package.json generated vendored
View File

@@ -2,7 +2,7 @@
"_args": [
[
"resolve@1.13.1",
"C:\\GitHub\\add-and-commit"
"C:\\EndBug\\GitHub\\add-and-commit"
]
],
"_from": "resolve@1.13.1",
@@ -27,7 +27,7 @@
],
"_resolved": "https://registry.npmjs.org/resolve/-/resolve-1.13.1.tgz",
"_spec": "1.13.1",
"_where": "C:\\GitHub\\add-and-commit",
"_where": "C:\\EndBug\\GitHub\\add-and-commit",
"author": {
"name": "James Halliday",
"email": "mail@substack.net",

6
node_modules/shelljs/package.json generated vendored
View File

@@ -2,7 +2,7 @@
"_args": [
[
"shelljs@0.8.3",
"C:\\GitHub\\add-and-commit"
"C:\\EndBug\\GitHub\\add-and-commit"
]
],
"_from": "shelljs@0.8.3",
@@ -26,13 +26,13 @@
],
"_resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.8.3.tgz",
"_spec": "0.8.3",
"_where": "C:\\GitHub\\add-and-commit",
"_where": "C:\\EndBug\\GitHub\\add-and-commit",
"ava": {
"serial": true,
"powerAssert": false
},
"bin": {
"shjs": "bin/shjs"
"shjs": "./bin/shjs"
},
"bugs": {
"url": "https://github.com/shelljs/shelljs/issues"

4
node_modules/wrappy/package.json generated vendored
View File

@@ -2,7 +2,7 @@
"_args": [
[
"wrappy@1.0.2",
"C:\\GitHub\\add-and-commit"
"C:\\EndBug\\GitHub\\add-and-commit"
]
],
"_from": "wrappy@1.0.2",
@@ -27,7 +27,7 @@
],
"_resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
"_spec": "1.0.2",
"_where": "C:\\GitHub\\add-and-commit",
"_where": "C:\\EndBug\\GitHub\\add-and-commit",
"author": {
"name": "Isaac Z. Schlueter",
"email": "i@izs.me",

2
package-lock.json generated
View File

@@ -1,6 +1,6 @@
{
"name": "add-and-commit",
"version": "2.3.0",
"version": "4.0.0",
"lockfileVersion": 1,
"requires": true,
"dependencies": {

View File

@@ -1,6 +1,6 @@
{
"name": "add-and-commit",
"version": "2.3.0",
"version": "4.0.0",
"description": "Add & commit files from a path directly from GitHub Actions",
"main": "lib/main.js",
"scripts": {

View File

@@ -1,5 +1,5 @@
#!/bin/bash
set -eu
set -u
cd $INPUT_CWD
echo "Running in $PWD."
@@ -22,7 +22,7 @@ EOF
add() {
if $INPUT_FORCE; then f=-f; else f=; fi
find $INPUT_PATH -name "$INPUT_PATTERN" | while read x; do git add $f $x; done
git add $INPUT_ADD $f
}
remove() {

View File

@@ -5,8 +5,8 @@ import * as path from 'path'
try {
checkInputs()
shell.exec(path.join(__dirname, '../src/entrypoint.sh'))
} catch (e) {
core.setFailed(e)
} catch (err) {
core.setFailed(err)
}
function checkInputs() {
@@ -26,4 +26,4 @@ function checkInputs() {
function setDefault(input: string, value: string) {
const key = 'INPUT_' + input.toUpperCase()
if (!process.env[key]) process.env[key] = value
}
}