From 64126f93b1a3be08061df8816f72c723fb07c139 Mon Sep 17 00:00:00 2001 From: Yoann Chaudet Date: Mon, 27 Dec 2021 14:45:57 -0800 Subject: [PATCH] Add --future support and + add a shellcheck --- .github/workflows/shellcheck.yml | 21 +++++++++++++++++++++ Gemfile | 2 +- action.yml.erb | 6 +++++- entrypoint.sh | 13 ++++++++++--- 4 files changed, 37 insertions(+), 5 deletions(-) create mode 100644 .github/workflows/shellcheck.yml diff --git a/.github/workflows/shellcheck.yml b/.github/workflows/shellcheck.yml new file mode 100644 index 0000000..911dbd0 --- /dev/null +++ b/.github/workflows/shellcheck.yml @@ -0,0 +1,21 @@ +name: 'ShellCheck' + +on: + pull_request: + paths: + - '**.sh' + +jobs: + shellcheck: + runs-on: ubuntu-latest + env: + SHELLCHECK_OPTS: -s bash + steps: + - name: Checkout repository + uses: actions/checkout@v2 + + - name: Run ShellCheck + uses: ludeeus/action-shellcheck@1.1.0 + with: + version: v0.8.0 + format: tty diff --git a/Gemfile b/Gemfile index 944d7b7..9365f9c 100644 --- a/Gemfile +++ b/Gemfile @@ -5,7 +5,7 @@ source "https://rubygems.org" git_source(:github) {|repo_name| "https://github.com/#{repo_name}" } # Manage our dependency on the version of the github-pages gem here. -gem "github-pages", "= 222" +gem "github-pages", "= 223" # Explicitly include this gem here. # It is not directly included in the github-pages gem list of dependencies, diff --git a/action.yml.erb b/action.yml.erb index 6ae7b8c..5ee6c7f 100644 --- a/action.yml.erb +++ b/action.yml.erb @@ -1,3 +1,4 @@ +# Generated from action.yml.erb # <%= nonce %> name: 'Pages Jekyll' description: 'A simple GitHub Action for producing Jekyll build artifacts compatible with GitHub Pages' @@ -10,6 +11,10 @@ inputs: description: 'Output directory of the build. Although it can be nested inside the source, it cannot be the same as the source directory.' required: false default: ./_site + future: + description: 'Publishes posts with a future date.' + required: false + default: true verbose: description: 'Verbose output' required: false @@ -21,4 +26,3 @@ inputs: runs: using: 'docker' image: '<%= pages_action_url %>' - diff --git a/entrypoint.sh b/entrypoint.sh index c78abac..9d25bc1 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -18,12 +18,19 @@ export JEKYLL_ENV="production" export JEKYLL_GITHUB_TOKEN=$INPUT_TOKEN export PAGES_REPO_NWO=$GITHUB_REPOSITORY -if [ -z $INPUT_VERBOSE ]; then +# Set verbose flag +if [ -z "$INPUT_VERBOSE" ]; then VERBOSE='' else VERBOSE='--verbose' fi -cd $PAGES_GEM_HOME +# Set future flag +if [ -z "$INPUT_FUTURE" ]; then + FUTURE='' +else + FUTURE='--future' +fi -$GITHUB_PAGES build $VERBOSE --source $SOURCE_DIRECTORY --destination $DESTINATION_DIRECTORY +cd "$PAGES_GEM_HOME" +$GITHUB_PAGES build $VERBOSE $FUTURE --source "$SOURCE_DIRECTORY" --destination "$DESTINATION_DIRECTORY"