Compare commits

...

46 Commits

Author SHA1 Message Date
Stefan Zweifel
f7e2c0f118 Release v2.4.0 2019-11-30 19:40:57 +01:00
Stefan Zweifel
8db04fa14f Merge pull request #21 from jkaan/feature/add-support-for-lfs
Install Git-LFS while building Dockerfile
2019-11-30 19:37:41 +01:00
Joey Kaan
44a415d3cb Install Git-LFS while building Dockerfile 2019-11-30 13:05:28 +01:00
Stefan Zweifel
af9e1689a5 Update Changelog 2019-11-27 20:07:24 +01:00
Stefan Zweifel
2b22ba6212 Merge pull request #19 from localheinz/fix/untracked
Fix: Use 'git status -s' to check for untracked/modified files
2019-11-27 20:03:09 +01:00
Andreas Möller
b1b8ae8b5c Fix: Use 'git status -s' to check for untracked/modified files 2019-11-27 11:24:27 +01:00
Stefan Zweifel
fb3de05451 Revert "Fix: Add files that are not tracked yet"
This reverts commit 65d8bdf167.
2019-11-24 12:21:42 +01:00
Stefan Zweifel
284d0b78f0 Fix: Add files that are not tracked yet (#17)
Fix: Add files that are not tracked yet
2019-11-22 13:00:18 +01:00
Stefan Zweifel
188fc2bd58 Delete foo 2019-11-22 12:59:27 +01:00
Andreas Möller
65d8bdf167 Fix: Add files that are not tracked yet 2019-11-22 11:55:58 +01:00
Stefan Zweifel
40255153c4 Fix Link in README 2019-11-04 20:09:04 +01:00
Stefan Zweifel
0ef5bf58dc Tag v2.3.0 2019-11-04 20:07:50 +01:00
Stefan Zweifel
e924b16154 Merge pull request #15 from gomorizsolt/issue-14_support-custom-git-params
Support custom git params.
Fixes #14
2019-11-04 20:04:09 +01:00
Gömöri Zsolt
2fb839c669 Remove is_defined() 2019-11-01 11:11:19 +01:00
Gömöri Zsolt
908446c002 Use :+ to avoid empty string 2019-11-01 11:03:23 +01:00
Gömöri Zsolt
2d23a29775 Use one-line if statement 2019-11-01 10:53:56 +01:00
Gömöri Zsolt
bdc88aff2c Re-add is_defined() to eliminate empty string in git commit 2019-11-01 10:44:09 +01:00
Gömöri Zsolt
ddcd35eaa8 Remove is_defined() approach 2019-11-01 10:19:20 +01:00
Gömöri Zsolt
760c9be2dc Define default value for file_pattern 2019-11-01 10:15:22 +01:00
Gömöri Zsolt
69d0349561 Log input params beforehand 2019-11-01 10:10:52 +01:00
Gömöri Zsolt
eecee2898e Follow GH Action's naming restrictions 2019-11-01 10:04:42 +01:00
Gömöri Zsolt
3889fd6a6c Add args entry to actions.yml 2019-11-01 09:51:54 +01:00
Gömöri Zsolt
1ad5315ba7 Fix log statement 2019-11-01 09:51:19 +01:00
gomorizsolt
fa043bd474 Remove junk code 2019-10-31 15:13:27 +01:00
gomorizsolt
af33cfbb5c Replace get_value with is_defined altogether 2019-10-31 14:49:38 +01:00
gomorizsolt
677efa2969 Remove blank line 2019-10-31 11:25:08 +01:00
gomorizsolt
b6dcf94303 Add is_defined and get_value to improve on code's reusability 2019-10-31 11:18:48 +01:00
gomorizsolt
a65a3a47cd Support commit options, update README.md accordingly 2019-10-31 09:02:56 +01:00
Stefan Zweifel
a607c57aa4 Update version in README 2019-10-26 16:38:54 +02:00
Stefan Zweifel
134234c02d Feature: Add File Pattern Input (#13)
Feature: Add File Pattern Input
2019-10-26 16:37:31 +02:00
Stefan Zweifel
73ba09a90c Update Description 2019-10-26 16:33:59 +02:00
Stefan Zweifel
92d05a9fc5 Update CHANGELOG 2019-10-26 16:33:17 +02:00
Stefan Zweifel
25c0d721b7 Reenable if condition 2019-10-26 14:00:59 +02:00
Stefan Zweifel
d6493da30b Disable if-condition 2019-10-26 13:58:34 +02:00
Stefan Zweifel
5de23163f2 Update actions.yml
Co-Authored-By: Zsolt Gomori <30864202+gomorizsolt@users.noreply.github.com>
2019-10-26 12:13:56 +02:00
Stefan Zweifel
16f4dc5956 Update README 2019-10-25 22:18:32 +02:00
Stefan Zweifel
03de600c97 Fixes 2019-10-25 20:57:03 +02:00
Stefan Zweifel
40956d2dbd Add file_pattern argument 2019-10-25 20:51:12 +02:00
Stefan Zweifel
9fc8aa621f Update issue templates 2019-10-03 20:24:57 +02:00
Stefan Zweifel
81c04ebd3c Create CODE_OF_CONDUCT.md 2019-10-03 20:19:57 +02:00
Stefan Zweifel
ef21fa22a3 Merge pull request #10 from mattdfloyd/patch-1
Update Dockerfile
2019-10-01 19:30:55 +02:00
mattdfloyd
e29ffba3a7 Update Dockerfile
Typo fix
2019-10-01 12:51:13 -04:00
Stefan Zweifel
c1a88fc967 Update README.md 2019-10-01 13:58:46 +02:00
Stefan Zweifel
12d8aff89d Update README 2019-09-22 15:05:43 +02:00
Stefan Zweifel
62474225c7 Update README 2019-09-22 14:52:33 +02:00
Stefan Zweifel
b60aaac666 Update README 2019-09-20 21:21:03 +02:00
8 changed files with 190 additions and 22 deletions

30
.github/ISSUE_TEMPLATE/bug_report.md vendored Normal file
View File

@@ -0,0 +1,30 @@
---
name: Bug report
about: Create a report to help us improve
title: ''
labels: ''
assignees: ''
---
**Version of the Action**
`v2.x.x`
**Describe the bug**
A clear and concise description of what the bug is.
**To Reproduce**
Steps to reproduce the behavior:
1. Go to '...'
2. Click on '....'
3. Scroll down to '....'
4. See error
**Expected behavior**
A clear and concise description of what you expected to happen.
**Screenshots**
If applicable, add screenshots to help explain your problem.
**Additional context**
Add any other context about the problem here.

View File

@@ -0,0 +1,20 @@
---
name: Feature request
about: Suggest an idea for this project
title: ''
labels: ''
assignees: ''
---
**Is your feature request related to a problem? Please describe.**
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
**Describe the solution you'd like**
A clear and concise description of what you want to happen.
**Describe alternatives you've considered**
A clear and concise description of any alternative solutions or features you've considered.
**Additional context**
Add any other context or screenshots about the feature request here.

View File

@@ -4,7 +4,23 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
## [Unreleased](https://github.com/stefanzweifel/git-auto-commit-action/compare/v2.1.0...HEAD)
## [Unreleased](https://github.com/stefanzweifel/git-auto-commit-action/compare/v2.4.0...HEAD)
## [v2.4.0](https://github.com/stefanzweifel/git-auto-commit-action/compare/v2.3.0...v2.4.0) - 2019-11-30
### Added
- Commit untracked files [#19](https://github.com/stefanzweifel/git-auto-commit-action/pull/19) (fixes [#16](https://github.com/stefanzweifel/git-auto-commit-action/issues/16))
- Add support for Git-LFS [#21](https://github.com/stefanzweifel/git-auto-commit-action/pull/21) (fixes [#20](https://github.com/stefanzweifel/git-auto-commit-action/issues/20))
## [v2.3.0](https://github.com/stefanzweifel/git-auto-commit-action/compare/v2.2.0...v2.3.0) - 2019-11-04
### Added
- Add a new `commit_option`-argument. Allows users to define additional commit options for the `git-commit` command. [#14](https://github.com/stefanzweifel/git-auto-commit-action/pull/15)
## [v2.2.0](https://github.com/stefanzweifel/git-auto-commit-action/compare/v2.1.0...v2.2.0) - 2019-10-26
### Added
- Add new `file_pattern`-argument. Allows users to define which files should be added in the commit. [#13](https://github.com/stefanzweifel/git-auto-commit-action/pull/13)
## [v2.1.0](https://github.com/stefanzweifel/git-auto-commit-action/compare/v2.0.0...v2.1.0) - 2019-09-20

76
CODE_OF_CONDUCT.md Normal file
View File

@@ -0,0 +1,76 @@
# Contributor Covenant Code of Conduct
## Our Pledge
In the interest of fostering an open and welcoming environment, we as
contributors and maintainers pledge to making participation in our project and
our community a harassment-free experience for everyone, regardless of age, body
size, disability, ethnicity, sex characteristics, gender identity and expression,
level of experience, education, socio-economic status, nationality, personal
appearance, race, religion, or sexual identity and orientation.
## Our Standards
Examples of behavior that contributes to creating a positive environment
include:
* Using welcoming and inclusive language
* Being respectful of differing viewpoints and experiences
* Gracefully accepting constructive criticism
* Focusing on what is best for the community
* Showing empathy towards other community members
Examples of unacceptable behavior by participants include:
* The use of sexualized language or imagery and unwelcome sexual attention or
advances
* Trolling, insulting/derogatory comments, and personal or political attacks
* Public or private harassment
* Publishing others' private information, such as a physical or electronic
address, without explicit permission
* Other conduct which could reasonably be considered inappropriate in a
professional setting
## Our Responsibilities
Project maintainers are responsible for clarifying the standards of acceptable
behavior and are expected to take appropriate and fair corrective action in
response to any instances of unacceptable behavior.
Project maintainers have the right and responsibility to remove, edit, or
reject comments, commits, code, wiki edits, issues, and other contributions
that are not aligned to this Code of Conduct, or to ban temporarily or
permanently any contributor for other behaviors that they deem inappropriate,
threatening, offensive, or harmful.
## Scope
This Code of Conduct applies both within project spaces and in public spaces
when an individual is representing the project or its community. Examples of
representing a project or community include using an official project e-mail
address, posting via an official social media account, or acting as an appointed
representative at an online or offline event. Representation of a project may be
further defined and clarified by project maintainers.
## Enforcement
Instances of abusive, harassing, or otherwise unacceptable behavior may be
reported by contacting the project team at hello@stefanzweifel.io. All
complaints will be reviewed and investigated and will result in a response that
is deemed necessary and appropriate to the circumstances. The project team is
obligated to maintain confidentiality with regard to the reporter of an incident.
Further details of specific enforcement policies may be posted separately.
Project maintainers who do not follow or enforce the Code of Conduct in good
faith may face temporary or permanent repercussions as determined by other
members of the project's leadership.
## Attribution
This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
[homepage]: https://www.contributor-covenant.org
For answers to common questions about this code of conduct, see
https://www.contributor-covenant.org/faq

View File

@@ -1,7 +1,7 @@
FROM alpine/git:1.0.7
LABEL "com.github.actions.name"="Auto Commit changed files"
LABEL "com.github.actions.description"="Auotmatically commit changed files and push changes back to remote repository."
LABEL "com.github.actions.description"="Automatically commits files which have been changed during the workflow run and push changes back to remote repository."
LABEL "com.github.actions.icon"="git-commit"
LABEL "com.github.actions.color"="orange"
@@ -9,6 +9,8 @@ LABEL "repository"="http://github.com/stefanzweifel/git-auto-commit-action"
LABEL "homepage"="http://github.com/stefanzweifel/git-auto-commit-action"
LABEL "maintainer"="Stefan Zweifel <hello@stefanzweifel.io>"
RUN apk add git-lfs
COPY entrypoint.sh /entrypoint.sh
ENTRYPOINT ["sh", "/entrypoint.sh"]

View File

@@ -1,7 +1,7 @@
# git-auto-commit-action
This GitHub Action automatically commits files which have been changed during a Workflow run and pushes the Commit back to GitHub.
The Committer is "GitHub Actions <actions@github.com>" and the Author of the Commit can be configured with input variables.
The Committer is "GitHub Actions <actions@github.com>" and the Author of the Commit is "Your GitHub Username <github_username@users.noreply.github.com>.
If no changes are available, the Actions does nothing.
@@ -13,27 +13,25 @@ This Action has been inspired and adapted from the [auto-commit](https://github.
Add the following step at the end of your job.
```yaml
- uses: stefanzweifel/git-auto-commit-action@v2.0.0
- uses: stefanzweifel/git-auto-commit-action@v2.3.0
with:
commit_message: Apply automatic changes
branch: ${{ github.head_ref }}
# Optional git params
commit_options: '--no-verify --signoff'
# Optional glob pattern of files which should be added to the commit
file_pattern: src/\*.js
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
```
You **do not** have to create a new secret called `GITHUB_TOKEN` in your repository. `GITHUB_TOKEN` is a special token GitHub creates automatically during an Action run. (See [the documentation](https://help.github.com/en/articles/virtual-environments-for-github-actions#creating-and-using-secrets-encrypted-variables) for details)
The Action will only commit files back, if changes are available. The resulting commit **will not trigger** another GitHub Actions Workflow run!
### Inputs
The following inputs are required
- `commit_message`: The commit message used when changes are available
- `branch`: Branch name where changes should be pushed to
### Environment Variables
The `GITHUB_TOKEN` secret is required. It is automatically available in your repository. You have to add it to the configuration though.
It is recommended to use this Action in Workflows which listen to the `pull_request` event. If you want to use the Action on other events, you have to hardcode the value for `branch` as `github.head_ref` is only available in Pull Requests.
## Example Usage
@@ -44,8 +42,13 @@ In this example I'm running `php-cs-fixer` in a PHP project.
```yaml
on: push
name: php-cs-fixer
on:
pull_request:
paths:
- '**.php'
jobs:
php-cs-fixer:
runs-on: ubuntu-latest
@@ -59,15 +62,20 @@ jobs:
uses: docker://oskarstark/php-cs-fixer-ga
- name: Commit changed files
uses: stefanzweifel/git-auto-commit-action@v2.0.0
uses: stefanzweifel/git-auto-commit-action@v2.3.0
with:
commit_message: Apply php-cs-fixer changes
branch: ${{ github.head_ref }}
file_pattern: src/\*.php
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
```
### Inputs
Checkout [`action.yml`](https://github.com/stefanzweifel/git-auto-commit-action/blob/master/action.yml) for a full list of supported inputs.
## Versioning
We use [SemVer](http://semver.org/) for versioning. For the versions available, see the [tags on this repository](https://github.com/stefanzweifel/git-auto-commit-action/tags).

View File

@@ -1,5 +1,5 @@
name: Git Auto Commit
description: 'Automatically commits files which have been changed.'
description: 'Automatically commits files which have been changed during the workflow run and push changes back to remote repository.'
author: Stefan Zweifel <hello@stefanzweifel.io>
@@ -7,13 +7,25 @@ inputs:
commit_message:
description: Commit message
required: true
commit_options:
description: Commit options
required: false
branch:
description: Branch where changes should be pushed too
required: true
file_pattern:
description: File pattern used for "git add"
required: false
default: '.'
runs:
using: 'docker'
image: 'Dockerfile'
args:
- ${{ inputs.commit_message }}
- ${{ inputs.commit_options }}
- ${{ inputs.branch }}
- ${{ inputs.file_pattern }}
branding:
icon: 'git-commit'

View File

@@ -1,4 +1,5 @@
#!/bin/sh
set -eu
# Set up .netrc file with GitHub credentials
@@ -18,10 +19,9 @@ EOF
git config --global user.name "GitHub Actions"
}
# This section only runs if there have been file changes
echo "Checking for uncommitted changes in the git working tree."
if ! git diff --quiet
if [[ -n "$(git status -s)" ]]
then
git_setup
@@ -30,9 +30,13 @@ then
# Switch to branch from current Workflow run
git checkout $INPUT_BRANCH
git add .
echo "INPUT_FILE_PATTERN: ${INPUT_FILE_PATTERN}"
git commit -m "$INPUT_COMMIT_MESSAGE" --author="$GITHUB_ACTOR <$GITHUB_ACTOR@users.noreply.github.com>"
git add "${INPUT_FILE_PATTERN}"
echo "INPUT_COMMIT_OPTIONS: ${INPUT_COMMIT_OPTIONS}"
git commit -m "$INPUT_COMMIT_MESSAGE" --author="$GITHUB_ACTOR <$GITHUB_ACTOR@users.noreply.github.com>" ${INPUT_COMMIT_OPTIONS:+"$INPUT_COMMIT_OPTIONS"}
git push --set-upstream origin "HEAD:$INPUT_BRANCH"
else