Merge branch 'main' into release-process-improvements
This commit is contained in:
@@ -56,18 +56,3 @@ jobs:
|
||||
uses: actions/[email protected]
|
||||
with:
|
||||
source-tag: ${{ env.TAG_NAME }}
|
||||
|
||||
# Login to the GHCR Docker registry
|
||||
- name: Log into registry ${{ env.REGISTRY }}
|
||||
uses: docker/login-action@v2
|
||||
with:
|
||||
registry: ${{ env.REGISTRY }}
|
||||
username: ${{ github.actor }}
|
||||
password: ${{ secrets.GITHUB_TOKEN }}
|
||||
|
||||
- name: Update Docker image tag
|
||||
env:
|
||||
NEW_TAG: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.update-major-tag.outputs.major-tag }}
|
||||
SOURCE_TAG: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ env.TAG_NAME }}
|
||||
run: |
|
||||
docker buildx imagetools create --tag $NEW_TAG $SOURCE_TAG
|
||||
|
||||
+1
-1
@@ -28,4 +28,4 @@ inputs:
|
||||
default: ${{ github.token }}
|
||||
runs:
|
||||
using: 'docker'
|
||||
image: 'docker://ghcr.io/actions/jekyll-build-pages:v1.0.7'
|
||||
image: 'docker://ghcr.io/actions/jekyll-build-pages:v1.0.8'
|
||||
|
||||
+2
-1
@@ -13,7 +13,7 @@ DESTINATION_DIRECTORY=${GITHUB_WORKSPACE}/$INPUT_DESTINATION
|
||||
PAGES_GEM_HOME=$BUNDLE_APP_CONFIG
|
||||
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
|
||||
echo "::warning:: github-pages can't satisfy your Gemfile's dependencies."
|
||||
fi
|
||||
@@ -23,6 +23,7 @@ export JEKYLL_ENV="production"
|
||||
export JEKYLL_GITHUB_TOKEN=$INPUT_TOKEN
|
||||
export PAGES_REPO_NWO=$GITHUB_REPOSITORY
|
||||
export JEKYLL_BUILD_REVISION=$INPUT_BUILD_REVISION
|
||||
export PAGES_API_URL=$GITHUB_API_URL
|
||||
|
||||
# Set verbose flag
|
||||
if [ "$INPUT_VERBOSE" = 'true' ]; then
|
||||
|
||||
@@ -103,20 +103,20 @@ GEM
|
||||
rb-fsevent (>= 0.9.3)
|
||||
rb-inotify (>= 0.9.7)
|
||||
mercenary (0.3.6)
|
||||
mini_portile2 (2.8.0)
|
||||
mini_portile2 (2.8.2)
|
||||
minima (2.0.0)
|
||||
minitest (5.9.1)
|
||||
multipart-post (2.0.0)
|
||||
net-dns (0.8.0)
|
||||
nokogiri (1.13.10)
|
||||
mini_portile2 (~> 2.8.0)
|
||||
nokogiri (1.15.2)
|
||||
mini_portile2 (~> 2.8.2)
|
||||
racc (~> 1.4)
|
||||
octokit (4.6.0)
|
||||
sawyer (~> 0.8.0, >= 0.5.3)
|
||||
pathutil (0.14.0)
|
||||
forwardable-extended (~> 2.6)
|
||||
public_suffix (1.5.3)
|
||||
racc (1.6.1)
|
||||
racc (1.7.1)
|
||||
rb-fsevent (0.9.8)
|
||||
rb-inotify (0.9.7)
|
||||
ffi (>= 0.5.0)
|
||||
|
||||
Reference in New Issue
Block a user