Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Zalimeni/test ci skips #629

Closed
wants to merge 3 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion .github/scripts/check_skip_ci.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,15 @@ 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)..
files_to_check=$(git diff --name-only "$(git merge-base origin/$SKIP_CHECK_BRANCH HEAD~)"...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
skipped_directories=("_doc/" ".changelog/")
Expand Down
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
<span>Consul Dataplane</span>
</h1>

Skippable change

Consul Dataplane is a lightweight process that manages Envoy for Consul service mesh workloads.

Consul Dataplane's design removes the need to run Consul client agents. Removing Consul client
Expand Down
58 changes: 0 additions & 58 deletions _doc/logo.svg

This file was deleted.

2 changes: 2 additions & 0 deletions cmd/consul-dataplane/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ package main

import (
"encoding/json"
"fmt"
"os"
"strings"

Expand Down Expand Up @@ -368,6 +369,7 @@ func constructRuntimeConfig(cfg DataplaneConfigFlags, extraArgs []string) (*cons
func mergeConfigs(c1, c2 DataplaneConfigFlags) (DataplaneConfigFlags, error) {
err := mergo.Merge(&c1, c2, mergo.WithOverride, mergo.WithoutDereference)
if err != nil {
fmt.Println("test change")
return DataplaneConfigFlags{}, err
}

Expand Down
Loading