Skip to content

Commit 9f6153e

Browse files
authored
Merge branch 'main' into release-process-improvements
2 parents 236e4cc + 1e8be5b commit 9f6153e

File tree

4 files changed

+7
-21
lines changed

4 files changed

+7
-21
lines changed

.github/workflows/release.yml

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -56,18 +56,3 @@ jobs:
5656
uses: actions/[email protected]
5757
with:
5858
source-tag: ${{ env.TAG_NAME }}
59-
60-
# Login to the GHCR Docker registry
61-
- name: Log into registry ${{ env.REGISTRY }}
62-
uses: docker/login-action@v2
63-
with:
64-
registry: ${{ env.REGISTRY }}
65-
username: ${{ github.actor }}
66-
password: ${{ secrets.GITHUB_TOKEN }}
67-
68-
- name: Update Docker image tag
69-
env:
70-
NEW_TAG: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.update-major-tag.outputs.major-tag }}
71-
SOURCE_TAG: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ env.TAG_NAME }}
72-
run: |
73-
docker buildx imagetools create --tag $NEW_TAG $SOURCE_TAG

action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,4 @@ inputs:
2828
default: ${{ github.token }}
2929
runs:
3030
using: 'docker'
31-
image: 'docker://ghcr.io/actions/jekyll-build-pages:v1.0.7'
31+
image: 'docker://ghcr.io/actions/jekyll-build-pages:v1.0.8'

entrypoint.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ DESTINATION_DIRECTORY=${GITHUB_WORKSPACE}/$INPUT_DESTINATION
1313
PAGES_GEM_HOME=$BUNDLE_APP_CONFIG
1414
GITHUB_PAGES_BIN=$PAGES_GEM_HOME/bin/github-pages
1515

16-
# Check if Gemfile's dependencies are satisfied or print a warning
16+
# Check if Gemfile's dependencies are satisfied or print a warning
1717
if test -e "$SOURCE_DIRECTORY/Gemfile" && ! bundle check --dry-run --gemfile "$SOURCE_DIRECTORY/Gemfile"; then
1818
echo "::warning:: github-pages can't satisfy your Gemfile's dependencies."
1919
fi
@@ -23,6 +23,7 @@ export JEKYLL_ENV="production"
2323
export JEKYLL_GITHUB_TOKEN=$INPUT_TOKEN
2424
export PAGES_REPO_NWO=$GITHUB_REPOSITORY
2525
export JEKYLL_BUILD_REVISION=$INPUT_BUILD_REVISION
26+
export PAGES_API_URL=$GITHUB_API_URL
2627

2728
# Set verbose flag
2829
if [ "$INPUT_VERBOSE" = 'true' ]; then

test_projects/mojombo/Gemfile.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -103,20 +103,20 @@ GEM
103103
rb-fsevent (>= 0.9.3)
104104
rb-inotify (>= 0.9.7)
105105
mercenary (0.3.6)
106-
mini_portile2 (2.8.0)
106+
mini_portile2 (2.8.2)
107107
minima (2.0.0)
108108
minitest (5.9.1)
109109
multipart-post (2.0.0)
110110
net-dns (0.8.0)
111-
nokogiri (1.13.10)
112-
mini_portile2 (~> 2.8.0)
111+
nokogiri (1.15.2)
112+
mini_portile2 (~> 2.8.2)
113113
racc (~> 1.4)
114114
octokit (4.6.0)
115115
sawyer (~> 0.8.0, >= 0.5.3)
116116
pathutil (0.14.0)
117117
forwardable-extended (~> 2.6)
118118
public_suffix (1.5.3)
119-
racc (1.6.1)
119+
racc (1.7.1)
120120
rb-fsevent (0.9.8)
121121
rb-inotify (0.9.7)
122122
ffi (>= 0.5.0)

0 commit comments

Comments
 (0)