Skip to content

Commit

Permalink
testable commit w/ Dockerfile change
Browse files Browse the repository at this point in the history
  • Loading branch information
zalimeni committed Sep 23, 2024
1 parent 39104a3 commit a9f1f21
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 1 deletion.
7 changes: 7 additions & 0 deletions .github/scripts/check_skip_ci.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,13 @@ set -euo pipefail
# ... `git merge-base origin/$SKIP_CHECK_BRANCH HEAD` would return commit `D`
# `...HEAD` specifies from the common ancestor to the latest commit on the current branch (HEAD)..
skip_check_branch=${SKIP_CHECK_BRANCH:?SKIP_CHECK_BRANCH is required}

git log -n3 --pretty=oneline

echo "skip check branch: $skip_check_branch"
echo "git merge-base origin/$skip_check_branch HEAD~: $(git merge-base origin/$skip_check_branch HEAD~)"
echo "git diff --name-only $(git merge-base origin/$skip_check_branch HEAD~)...HEAD: $(git diff --name-only "$(git merge-base origin/$skip_check_branch HEAD~)"...HEAD)"

files_to_check=$(git diff --name-only "$(git merge-base origin/$skip_check_branch HEAD~)"...HEAD)

# Define the directories to check
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
# Official docker image that includes binaries from releases.hashicorp.com. This
# downloads the release from releases.hashicorp.com and therefore requires that
# the release is published before building the Docker image.
FROM docker.mirror.hashicorp.services/alpine:3.20 as official
FROM docker.mirror.hashicorp.services/alpine:3.19 as official

# This is the release of Consul to pull in.
ARG VERSION
Expand Down

0 comments on commit a9f1f21

Please sign in to comment.