Commit a4d48eaf authored by Peter Parente's avatar Peter Parente Committed by GitHub

Merge pull request #1138 from parente/fix-wiki-commit

[ci skip] Fix wiki commit, 'ci skip' support
parents 795a0bb6 006de91b
...@@ -20,7 +20,9 @@ jobs: ...@@ -20,7 +20,9 @@ jobs:
build: build:
name: Build Docker Images name: Build Docker Images
runs-on: ubuntu-latest runs-on: ubuntu-latest
if: "!contains(github.event.head_commit.message , 'ci skip')" if: >
!contains(github.event.head_commit.message, 'ci skip') &&
!contains(github.event.pull_request.title, 'ci skip')
steps: steps:
- name: Clone Main Repo - name: Clone Main Repo
uses: actions/checkout@v2 uses: actions/checkout@v2
......
...@@ -16,7 +16,9 @@ jobs: ...@@ -16,7 +16,9 @@ jobs:
build: build:
name: Build Sphinx Documentation name: Build Sphinx Documentation
runs-on: ubuntu-latest runs-on: ubuntu-latest
if: "!contains(github.event.head_commit.message , 'ci skip')" if: >
!contains(github.event.head_commit.message , 'ci skip') &&
!contains(github.event.pull_request.title, 'ci skip')
steps: steps:
- name: Checkout Repo - name: Checkout Repo
uses: actions/checkout@v2 uses: actions/checkout@v2
......
...@@ -87,11 +87,11 @@ git-commit: ## commit outstading git changes and push to remote ...@@ -87,11 +87,11 @@ git-commit: ## commit outstading git changes and push to remote
@git config --global user.email "actions@users.noreply.github.com" @git config --global user.email "actions@users.noreply.github.com"
@git remote add publisher https://$(GITHUB_TOKEN)@github.com/$(GITHUB_REPOSITORY).git @git remote add publisher https://$(GITHUB_TOKEN)@github.com/$(GITHUB_REPOSITORY).git
@cd $(LOCAL_PATH) @cd $(LOCAL_PATH) && \
@git checkout master git checkout master && \
@git add -A -- . git add -A -- . && \
@git commit -m "[ci skip] Automated publish for $(GITHUB_SHA)" || exit 0 git commit -m "[ci skip] Automated publish for $(GITHUB_SHA)" || exit 0 && \
@git push -u publisher master git push -u publisher master
hook/%: export COMMIT_MSG?=$(shell git log -1 --pretty=%B) hook/%: export COMMIT_MSG?=$(shell git log -1 --pretty=%B)
hook/%: export GITHUB_SHA?=$(shell git rev-parse HEAD) hook/%: export GITHUB_SHA?=$(shell git rev-parse HEAD)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment