actions/jekyll-build-pages
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' into release-process-improvements

Browse Source
This commit is contained in:
Yoann Chaudet
2024-02-09 11:41:09 -08:00
committed by GitHub
parent 9f6153e870 6f827f0167
commit 83b6c92deb
10 changed files with 44 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/dependabot.yml
+6
View File
@@ -4,8 +4,14 @@ updates:
directory: "/" directory: "/"
schedule: schedule:
interval: "weekly" interval: "weekly"
groups:
non-breaking-changes:
update-types: [minor, patch]
- package-ecosystem: "github-actions" - package-ecosystem: "github-actions"
directory: "/" directory: "/"
schedule: schedule:
interval: "weekly" interval: "weekly"
groups:
non-breaking-changes:
update-types: [minor, patch]
.github/workflows/docker-publish.yml
+4 -4
View File
@@ -24,12 +24,12 @@ jobs:
steps: steps:
- name: Checkout repository - name: Checkout repository
uses: actions/checkout@v3 uses: actions/checkout@v4
# Login against a Docker registry except on PR # Login against a Docker registry except on PR
# https://github.com/docker/login-action # https://github.com/docker/login-action
- name: Log into registry ${{ env.REGISTRY }} - name: Log into registry ${{ env.REGISTRY }}
uses: docker/login-action@v2 uses: docker/login-action@v3
with: with:
registry: ${{ env.REGISTRY }} registry: ${{ env.REGISTRY }}
username: ${{ github.actor }} username: ${{ github.actor }}
@@ -46,14 +46,14 @@ jobs:
echo "tags=$tags" >> $GITHUB_OUTPUT echo "tags=$tags" >> $GITHUB_OUTPUT
- name: Extract Docker metadata - name: Extract Docker metadata
id: meta id: meta
uses: docker/metadata-action@v4 uses: docker/metadata-action@v5
with: with:
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
# Build and push Docker image with Buildx (don't push on PR) # Build and push Docker image with Buildx (don't push on PR)
# https://github.com/docker/build-push-action # https://github.com/docker/build-push-action
- name: Build and push Docker image - name: Build and push Docker image
uses: docker/build-push-action@v4 uses: docker/build-push-action@v5
with: with:
context: . context: .
file: Dockerfile file: Dockerfile
.github/workflows/draft-release.yml
+1 -1
View File
@@ -11,7 +11,7 @@ jobs:
draft-release: draft-release:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v4
- uses: release-drafter/release-drafter@v5 - uses: release-drafter/release-drafter@v5
env: env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
.github/workflows/record.yml
+3 -3
View File
@@ -16,7 +16,7 @@ jobs:
tag: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.regex-match.outputs.group1 }} tag: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.regex-match.outputs.group1 }}
steps: steps:
- name: Checkout repository - name: Checkout repository
uses: actions/checkout@v3 uses: actions/checkout@v4
- name: Grep action.yaml content - name: Grep action.yaml content
id: grep-image-content id: grep-image-content
run: | run: |
@@ -44,9 +44,9 @@ jobs:
- future-true - future-true
steps: steps:
- name: Checkout repository - name: Checkout repository
uses: actions/checkout@v3 uses: actions/checkout@v4
- name: Build local docker image - name: Build local docker image
uses: docker/build-push-action@v4 uses: docker/build-push-action@v5
with: with:
context: . context: .
file: Dockerfile file: Dockerfile
.github/workflows/release.yml
+2 -2
View File
@@ -21,7 +21,7 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: Checkout repository - name: Checkout repository
uses: actions/checkout@v3 uses: actions/checkout@v4
- name: Grep action.yaml content - name: Grep action.yaml content
id: grep-image-content id: grep-image-content
run: | run: |
@@ -53,6 +53,6 @@ jobs:
steps: steps:
- name: Update the ${{ env.TAG_NAME }} major tag - name: Update the ${{ env.TAG_NAME }} major tag
id: update-major-tag id: update-major-tag
uses: actions/publish-action@v0.2.2 uses: actions/publish-action@v0.3.0
with: with:
source-tag: ${{ env.TAG_NAME }} source-tag: ${{ env.TAG_NAME }}
.github/workflows/shellcheck.yml
+1 -1
View File
@@ -14,7 +14,7 @@ jobs:
SHELLCHECK_OPTS: -s bash SHELLCHECK_OPTS: -s bash
steps: steps:
- name: Checkout repository - name: Checkout repository
uses: actions/checkout@v3 uses: actions/checkout@v4
- name: Run ShellCheck - name: Run ShellCheck
uses: ludeeus/action-shellcheck@master uses: ludeeus/action-shellcheck@master
.github/workflows/test.yml
+3 -3
View File
@@ -18,7 +18,7 @@ jobs:
tag: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.regex-match.outputs.group1 }} tag: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.regex-match.outputs.group1 }}
steps: steps:
- name: Checkout repository - name: Checkout repository
uses: actions/checkout@v3 uses: actions/checkout@v4
- name: Grep action.yaml content - name: Grep action.yaml content
id: grep-image-content id: grep-image-content
run: | run: |
@@ -46,9 +46,9 @@ jobs:
- future-true - future-true
steps: steps:
- name: Checkout repository - name: Checkout repository
uses: actions/checkout@v3 uses: actions/checkout@v4
- name: Build local docker image - name: Build local docker image
uses: docker/build-push-action@v4 uses: docker/build-push-action@v5
with: with:
context: . context: .
file: Dockerfile file: Dockerfile
action.yml
+1 -1
View File
@@ -28,4 +28,4 @@ inputs:
default: ${{ github.token }} default: ${{ github.token }}
runs: runs:
using: 'docker' using: 'docker'
image: 'docker://ghcr.io/actions/jekyll-build-pages:v1.0.8' image: 'docker://ghcr.io/actions/jekyll-build-pages:v1.0.9'
entrypoint.sh
+20 -5
View File
@@ -6,8 +6,6 @@
# #
#################################################################################################### ####################################################################################################
set -o errexit
SOURCE_DIRECTORY=${GITHUB_WORKSPACE}/$INPUT_SOURCE SOURCE_DIRECTORY=${GITHUB_WORKSPACE}/$INPUT_SOURCE
DESTINATION_DIRECTORY=${GITHUB_WORKSPACE}/$INPUT_DESTINATION DESTINATION_DIRECTORY=${GITHUB_WORKSPACE}/$INPUT_DESTINATION
PAGES_GEM_HOME=$BUNDLE_APP_CONFIG PAGES_GEM_HOME=$BUNDLE_APP_CONFIG
@@ -15,7 +13,7 @@ GITHUB_PAGES_BIN=$PAGES_GEM_HOME/bin/github-pages
# Check if Gemfile's dependencies are satisfied or print a warning # Check if Gemfile's dependencies are satisfied or print a warning
if test -e "$SOURCE_DIRECTORY/Gemfile" && ! bundle check --dry-run --gemfile "$SOURCE_DIRECTORY/Gemfile"; then if test -e "$SOURCE_DIRECTORY/Gemfile" && ! bundle check --dry-run --gemfile "$SOURCE_DIRECTORY/Gemfile"; then
echo "::warning:: github-pages can't satisfy your Gemfile's dependencies." echo "::warning::The github-pages gem can't satisfy your Gemfile's dependencies. If you want to use a different Jekyll version or need additional dependencies, consider building Jekyll site with GitHub Actions: https://jekyllrb.com/docs/continuous-integration/github-actions/"
fi fi
# Set environment variables required by supported plugins # Set environment variables required by supported plugins
@@ -39,5 +37,22 @@ else
FUTURE='' FUTURE=''
fi fi
cd "$PAGES_GEM_HOME" { cd "$PAGES_GEM_HOME" || { echo "::error::pages gem not found"; exit 1; }; }
$GITHUB_PAGES_BIN build "$VERBOSE" "$FUTURE" --source "$SOURCE_DIRECTORY" --destination "$DESTINATION_DIRECTORY"
# Run the command, capturing the output
build_output="$($GITHUB_PAGES_BIN build "$VERBOSE" "$FUTURE" --source "$SOURCE_DIRECTORY" --destination "$DESTINATION_DIRECTORY")"
# Capture the exit code
exit_code=$?
if [ $exit_code -ne 0 ]; then
# Remove the newlines from the build_output as annotation not support multiline
error=$(echo "$build_output" | tr '\n' ' ' | tr -s ' ')
echo "::error::$error"
else
# Display the build_output directly
echo "$build_output"
fi
# Exit with the captured exit code
exit $exit_code
test_projects/mojombo/Gemfile.lock
+3 -3
View File
@@ -103,12 +103,12 @@ GEM
rb-fsevent (>= 0.9.3) rb-fsevent (>= 0.9.3)
rb-inotify (>= 0.9.7) rb-inotify (>= 0.9.7)
mercenary (0.3.6) mercenary (0.3.6)
mini_portile2 (2.8.2) mini_portile2 (2.8.5)
minima (2.0.0) minima (2.0.0)
minitest (5.9.1) minitest (5.9.1)
multipart-post (2.0.0) multipart-post (2.0.0)
net-dns (0.8.0) net-dns (0.8.0)
nokogiri (1.15.2) nokogiri (1.16.2)
mini_portile2 (~> 2.8.2) mini_portile2 (~> 2.8.2)
racc (~> 1.4) racc (~> 1.4)
octokit (4.6.0) octokit (4.6.0)
@@ -116,7 +116,7 @@ GEM
pathutil (0.14.0) pathutil (0.14.0)
forwardable-extended (~> 2.6) forwardable-extended (~> 2.6)
public_suffix (1.5.3) public_suffix (1.5.3)
racc (1.7.1) racc (1.7.3)
rb-fsevent (0.9.8) rb-fsevent (0.9.8)
rb-inotify (0.9.7) rb-inotify (0.9.7)
ffi (>= 0.5.0) ffi (>= 0.5.0)