From 84a94c413e6c8ebbdfc33af93fee0e9cce16e8eb Mon Sep 17 00:00:00 2001 From: yimysty Date: Thu, 19 Oct 2023 17:34:27 -0700 Subject: [PATCH 01/11] set the right annotation --- entrypoint.sh | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/entrypoint.sh b/entrypoint.sh index 024fe95..1941b75 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -6,8 +6,6 @@ # #################################################################################################### -set -o errexit - SOURCE_DIRECTORY=${GITHUB_WORKSPACE}/$INPUT_SOURCE DESTINATION_DIRECTORY=${GITHUB_WORKSPACE}/$INPUT_DESTINATION PAGES_GEM_HOME=$BUNDLE_APP_CONFIG @@ -40,4 +38,21 @@ else fi cd "$PAGES_GEM_HOME" -$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 From 92113c15ddadcbfdf53470c1fb0de069795d88e4 Mon Sep 17 00:00:00 2001 From: yimysty Date: Thu, 19 Oct 2023 17:40:15 -0700 Subject: [PATCH 02/11] fix bash lint --- entrypoint.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/entrypoint.sh b/entrypoint.sh index 1941b75..84d9d32 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -37,7 +37,7 @@ else FUTURE='' fi -cd "$PAGES_GEM_HOME" +{ cd "$PAGES_GEM_HOME" || { echo "::error::pages gem not found"; exit 1; }; } # Run the command, capturing the output build_output="$($GITHUB_PAGES_BIN build "$VERBOSE" "$FUTURE" --source "$SOURCE_DIRECTORY" --destination "$DESTINATION_DIRECTORY")" From 0b2633b4e0679fbc51ef9570d7a6f3b91c04695e Mon Sep 17 00:00:00 2001 From: yimysty Date: Thu, 19 Oct 2023 22:02:00 -0700 Subject: [PATCH 03/11] ready 1.0.9 release --- action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/action.yml b/action.yml index d95d4cc..2cf6a9b 100644 --- a/action.yml +++ b/action.yml @@ -28,4 +28,4 @@ inputs: default: ${{ github.token }} runs: using: 'docker' - image: 'docker://ghcr.io/actions/jekyll-build-pages:v1.0.8' + image: 'docker://ghcr.io/actions/jekyll-build-pages:v1.0.9' From e9ec94b518184f806907923eaeb6bc69294b0bce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=81=AA=E3=81=A4=E3=81=8D?= Date: Thu, 14 Sep 2023 11:38:04 -0700 Subject: [PATCH 04/11] Improve gem dependency warning message --- entrypoint.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/entrypoint.sh b/entrypoint.sh index 84d9d32..0eb3fac 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -13,7 +13,7 @@ GITHUB_PAGES_BIN=$PAGES_GEM_HOME/bin/github-pages # 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 - 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 # Set environment variables required by supported plugins From 4c407e56997e6326f10f1d407da60c1b7b75132a Mon Sep 17 00:00:00 2001 From: "James M. Greene" Date: Wed, 31 Jan 2024 00:35:20 -0600 Subject: [PATCH 05/11] Update Dependabot config to group non-breaking changes --- .github/dependabot.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index e929360..ec2b32c 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -4,8 +4,14 @@ updates: directory: "/" schedule: interval: "weekly" + groups: + non-breaking-changes: + update-types: [minor, patch] - package-ecosystem: "github-actions" directory: "/" schedule: interval: "weekly" + groups: + non-breaking-changes: + update-types: [minor, patch] From fed441c15f40d4f4444cf80ee31dbd9c31536f64 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 31 Jan 2024 17:27:03 +0000 Subject: [PATCH 06/11] Bump the non-breaking-changes group with 1 update Bumps the non-breaking-changes group with 1 update: [actions/publish-action](https://github.com/actions/publish-action). Updates `actions/publish-action` from 0.2.2 to 0.3.0 - [Commits](https://github.com/actions/publish-action/compare/v0.2.2...v0.3.0) --- updated-dependencies: - dependency-name: actions/publish-action dependency-type: direct:production update-type: version-update:semver-minor dependency-group: non-breaking-changes ... Signed-off-by: dependabot[bot] --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 665864d..c74aabf 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -53,6 +53,6 @@ jobs: steps: - name: Update the ${{ env.TAG_NAME }} major tag id: update-major-tag - uses: actions/publish-action@v0.2.2 + uses: actions/publish-action@v0.3.0 with: source-tag: ${{ env.TAG_NAME }} From 81cc8fc3ff1ab0f9ff16c25b1280bdace0716bbf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 7 Feb 2024 06:04:20 +0000 Subject: [PATCH 07/11] Bump actions/checkout from 3 to 4 Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 4. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v3...v4) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/docker-publish.yml | 2 +- .github/workflows/draft-release.yml | 2 +- .github/workflows/record.yml | 4 ++-- .github/workflows/release.yml | 2 +- .github/workflows/shellcheck.yml | 2 +- .github/workflows/test.yml | 4 ++-- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml index 15d772a..8eca0b0 100644 --- a/.github/workflows/docker-publish.yml +++ b/.github/workflows/docker-publish.yml @@ -24,7 +24,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 # Login against a Docker registry except on PR # https://github.com/docker/login-action diff --git a/.github/workflows/draft-release.yml b/.github/workflows/draft-release.yml index d6d081b..da3e3ee 100644 --- a/.github/workflows/draft-release.yml +++ b/.github/workflows/draft-release.yml @@ -11,7 +11,7 @@ jobs: draft-release: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: release-drafter/release-drafter@v5 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/record.yml b/.github/workflows/record.yml index 2211356..5f7bdbc 100644 --- a/.github/workflows/record.yml +++ b/.github/workflows/record.yml @@ -16,7 +16,7 @@ jobs: tag: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.regex-match.outputs.group1 }} steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Grep action.yaml content id: grep-image-content run: | @@ -44,7 +44,7 @@ jobs: - future-true steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Build local docker image uses: docker/build-push-action@v4 with: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c74aabf..03c06d9 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -21,7 +21,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Grep action.yaml content id: grep-image-content run: | diff --git a/.github/workflows/shellcheck.yml b/.github/workflows/shellcheck.yml index f92279d..0789451 100644 --- a/.github/workflows/shellcheck.yml +++ b/.github/workflows/shellcheck.yml @@ -14,7 +14,7 @@ jobs: SHELLCHECK_OPTS: -s bash steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Run ShellCheck uses: ludeeus/action-shellcheck@master diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 29a0508..4e3a30b 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -18,7 +18,7 @@ jobs: tag: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.regex-match.outputs.group1 }} steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Grep action.yaml content id: grep-image-content run: | @@ -46,7 +46,7 @@ jobs: - future-true steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Build local docker image uses: docker/build-push-action@v4 with: From e546fcd8fbdd32ced67ca50a887a9a7e2ebebcb0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 7 Feb 2024 06:10:18 +0000 Subject: [PATCH 08/11] Bump docker/build-push-action from 4 to 5 Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 4 to 5. - [Release notes](https://github.com/docker/build-push-action/releases) - [Commits](https://github.com/docker/build-push-action/compare/v4...v5) --- updated-dependencies: - dependency-name: docker/build-push-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/docker-publish.yml | 2 +- .github/workflows/record.yml | 2 +- .github/workflows/test.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml index 8eca0b0..9e8c3ab 100644 --- a/.github/workflows/docker-publish.yml +++ b/.github/workflows/docker-publish.yml @@ -53,7 +53,7 @@ jobs: # Build and push Docker image with Buildx (don't push on PR) # https://github.com/docker/build-push-action - name: Build and push Docker image - uses: docker/build-push-action@v4 + uses: docker/build-push-action@v5 with: context: . file: Dockerfile diff --git a/.github/workflows/record.yml b/.github/workflows/record.yml index 5f7bdbc..86ff1f1 100644 --- a/.github/workflows/record.yml +++ b/.github/workflows/record.yml @@ -46,7 +46,7 @@ jobs: - name: Checkout repository uses: actions/checkout@v4 - name: Build local docker image - uses: docker/build-push-action@v4 + uses: docker/build-push-action@v5 with: context: . file: Dockerfile diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 4e3a30b..4cf2e0e 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -48,7 +48,7 @@ jobs: - name: Checkout repository uses: actions/checkout@v4 - name: Build local docker image - uses: docker/build-push-action@v4 + uses: docker/build-push-action@v5 with: context: . file: Dockerfile From a156fa2e37884710c9afe5c6a9230804db48acc3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 7 Feb 2024 06:13:01 +0000 Subject: [PATCH 09/11] Bump docker/metadata-action from 4 to 5 Bumps [docker/metadata-action](https://github.com/docker/metadata-action) from 4 to 5. - [Release notes](https://github.com/docker/metadata-action/releases) - [Upgrade guide](https://github.com/docker/metadata-action/blob/master/UPGRADE.md) - [Commits](https://github.com/docker/metadata-action/compare/v4...v5) --- updated-dependencies: - dependency-name: docker/metadata-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/docker-publish.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml index 9e8c3ab..1906b9c 100644 --- a/.github/workflows/docker-publish.yml +++ b/.github/workflows/docker-publish.yml @@ -46,7 +46,7 @@ jobs: echo "tags=$tags" >> $GITHUB_OUTPUT - name: Extract Docker metadata id: meta - uses: docker/metadata-action@v4 + uses: docker/metadata-action@v5 with: images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} From 5d74132e75f9f40da5d9b9fc6b5c0992eead309f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 7 Feb 2024 06:17:37 +0000 Subject: [PATCH 10/11] Bump docker/login-action from 2 to 3 Bumps [docker/login-action](https://github.com/docker/login-action) from 2 to 3. - [Release notes](https://github.com/docker/login-action/releases) - [Commits](https://github.com/docker/login-action/compare/v2...v3) --- updated-dependencies: - dependency-name: docker/login-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/docker-publish.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml index 1906b9c..8250758 100644 --- a/.github/workflows/docker-publish.yml +++ b/.github/workflows/docker-publish.yml @@ -29,7 +29,7 @@ jobs: # Login against a Docker registry except on PR # https://github.com/docker/login-action - name: Log into registry ${{ env.REGISTRY }} - uses: docker/login-action@v2 + uses: docker/login-action@v3 with: registry: ${{ env.REGISTRY }} username: ${{ github.actor }} From 5f897132388a42c0bb6a12d8c8802052e9ee57d4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 9 Feb 2024 03:48:51 +0000 Subject: [PATCH 11/11] Bump the bundler group across 1 directories with 1 update Bumps the bundler group with 1 update in the /test_projects/mojombo directory: [nokogiri](https://github.com/sparklemotion/nokogiri). Updates `nokogiri` from 1.15.2 to 1.16.2 - [Release notes](https://github.com/sparklemotion/nokogiri/releases) - [Changelog](https://github.com/sparklemotion/nokogiri/blob/main/CHANGELOG.md) - [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.15.2...v1.16.2) --- updated-dependencies: - dependency-name: nokogiri dependency-type: indirect ... Signed-off-by: dependabot[bot] --- test_projects/mojombo/Gemfile.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test_projects/mojombo/Gemfile.lock b/test_projects/mojombo/Gemfile.lock index 60f8627..8b1d6d2 100644 --- a/test_projects/mojombo/Gemfile.lock +++ b/test_projects/mojombo/Gemfile.lock @@ -103,12 +103,12 @@ GEM rb-fsevent (>= 0.9.3) rb-inotify (>= 0.9.7) mercenary (0.3.6) - mini_portile2 (2.8.2) + mini_portile2 (2.8.5) minima (2.0.0) minitest (5.9.1) multipart-post (2.0.0) net-dns (0.8.0) - nokogiri (1.15.2) + nokogiri (1.16.2) mini_portile2 (~> 2.8.2) racc (~> 1.4) octokit (4.6.0) @@ -116,7 +116,7 @@ GEM pathutil (0.14.0) forwardable-extended (~> 2.6) public_suffix (1.5.3) - racc (1.7.1) + racc (1.7.3) rb-fsevent (0.9.8) rb-inotify (0.9.7) ffi (>= 0.5.0)