From f31a1c67beb5a32a2a9a3e8fa216408fb3307982 Mon Sep 17 00:00:00 2001 From: Hiroto Funakoshi Date: Fri, 26 Jul 2024 13:00:14 +0900 Subject: [PATCH] Backport PR #2542, #2538 to release/v1.7 (#2543) * fix: deleted unnecessary event path for docker build (#2538) Signed-off-by: hlts2 * fix: fix info path location (#2542) Signed-off-by: hlts2 --------- Signed-off-by: hlts2 --- .github/workflows/backport.yml | 2 +- .github/workflows/dockers-agent-faiss-image.yml | 16 ---------------- .github/workflows/dockers-agent-image.yml | 13 ------------- .github/workflows/dockers-agent-ngt-image.yml | 16 ---------------- .../workflows/dockers-agent-sidecar-image.yml | 16 ---------------- .../workflows/dockers-benchmark-job-image.yml | 16 ---------------- .../dockers-benchmark-operator-image.yaml | 16 ---------------- .../workflows/dockers-ci-container-image.yml | 9 --------- .../workflows/dockers-dev-container-image.yml | 9 --------- .../workflows/dockers-discoverer-k8s-image.yml | 14 -------------- .../workflows/dockers-gateway-filter-image.yml | 17 ----------------- .github/workflows/dockers-gateway-lb-image.yml | 17 ----------------- .../workflows/dockers-gateway-mirror-image.yaml | 16 ---------------- .../workflows/dockers-helm-operator-image.yml | 12 ------------ .github/workflows/dockers-index-correction.yml | 14 -------------- .github/workflows/dockers-index-creation.yml | 14 -------------- .github/workflows/dockers-index-operator.yml | 14 -------------- .github/workflows/dockers-index-save.yml | 14 -------------- .github/workflows/dockers-loadtest-image.yml | 15 --------------- .../workflows/dockers-manager-index-image.yml | 15 --------------- .../workflows/dockers-readreplica-rotate.yml | 14 -------------- 21 files changed, 1 insertion(+), 288 deletions(-) diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml index 2af5ac45f2..d092b85019 100644 --- a/.github/workflows/backport.yml +++ b/.github/workflows/backport.yml @@ -23,7 +23,7 @@ on: env: TARGET_LABEL_NAME_PREFIX: "actions/backport/" BACKPORT_BRANCH_NAME_PREFIX: "backport" - FETCHED_GITHUB_INFO_PATH: github_info.json + FETCHED_GITHUB_INFO_PATH: /tmp/github_info.json GITHUB_USER: ${{ secrets.DISPATCH_USER }} GITHUB_TOKEN: ${{ secrets.DISPATCH_TOKEN }} jobs: diff --git a/.github/workflows/dockers-agent-faiss-image.yml b/.github/workflows/dockers-agent-faiss-image.yml index 9c6ef548a6..0e2931fa86 100644 --- a/.github/workflows/dockers-agent-faiss-image.yml +++ b/.github/workflows/dockers-agent-faiss-image.yml @@ -25,22 +25,6 @@ on: - "v*.*.*" - "*.*.*-*" - "v*.*.*-*" - paths: - - ".github/actions/docker-build/action.yaml" - - ".github/workflows/_docker-image.yaml" - - ".github/workflows/dockers-agent-faiss-image.yml" - - "go.mod" - - "go.sum" - - "internal/**" - - "!internal/**/*_test.go" - - "!internal/db/**" - - "!internal/k8s/**" - - "apis/grpc/**" - - "pkg/agent/core/faiss/**" - - "cmd/agent/core/faiss/**" - - "dockers/agent/core/faiss/Dockerfile" - - "versions/GO_VERSION" - - "versions/FAISS_VERSION" pull_request: paths: - ".github/actions/docker-build/action.yaml" diff --git a/.github/workflows/dockers-agent-image.yml b/.github/workflows/dockers-agent-image.yml index b4ae752529..3ccd1161f3 100644 --- a/.github/workflows/dockers-agent-image.yml +++ b/.github/workflows/dockers-agent-image.yml @@ -25,19 +25,6 @@ on: - "v*.*.*" - "*.*.*-*" - "v*.*.*-*" - paths: - - ".github/actions/docker-build/action.yaml" - - ".github/workflows/_docker-image.yaml" - - ".github/workflows/dockers-agent-image.yml" - - "rust/Cargo.lock" - - "rust/Cargo.toml" - - "rust/bin/agent/**" - - "rust/libs/ngt/**" - - "rust/libs/ngt-rs/**" - - "rust/libs/proto/**" - - "dockers/agent/core/ngt-rust/Dockerfile" - - "versions/RUST_VERSION" - - "versions/NGT_VERSION" pull_request: paths: - ".github/actions/docker-build/action.yaml" diff --git a/.github/workflows/dockers-agent-ngt-image.yml b/.github/workflows/dockers-agent-ngt-image.yml index a00ebe4158..64c8d7b74d 100644 --- a/.github/workflows/dockers-agent-ngt-image.yml +++ b/.github/workflows/dockers-agent-ngt-image.yml @@ -25,22 +25,6 @@ on: - "v*.*.*" - "*.*.*-*" - "v*.*.*-*" - paths: - - ".github/actions/docker-build/action.yaml" - - ".github/workflows/_docker-image.yaml" - - ".github/workflows/dockers-agent-ngt-image.yml" - - "go.mod" - - "go.sum" - - "internal/**" - - "!internal/**/*_test.go" - - "!internal/db/**" - - "internal/k8s/**" - - "apis/grpc/**" - - "pkg/agent/core/ngt/**" - - "cmd/agent/core/ngt/**" - - "dockers/agent/core/ngt/Dockerfile" - - "versions/GO_VERSION" - - "versions/NGT_VERSION" pull_request: paths: - ".github/actions/docker-build/action.yaml" diff --git a/.github/workflows/dockers-agent-sidecar-image.yml b/.github/workflows/dockers-agent-sidecar-image.yml index 36d9807105..38ae9eeb3a 100644 --- a/.github/workflows/dockers-agent-sidecar-image.yml +++ b/.github/workflows/dockers-agent-sidecar-image.yml @@ -25,22 +25,6 @@ on: - "v*.*.*" - "*.*.*-*" - "v*.*.*-*" - paths: - - ".github/actions/docker-build/action.yaml" - - ".github/workflows/_docker-image.yaml" - - ".github/workflows/dockers-agent-sidecar-image.yml" - - "go.mod" - - "go.sum" - - "internal/**" - - "!internal/**/*_test.go" - - "!internal/db/**" - - "internal/db/storage/blob/**" - - "!internal/k8s/**" - - "apis/grpc/**" - - "pkg/agent/sidecar/**" - - "cmd/agent/sidecar/**" - - "dockers/agent/sidecar/Dockerfile" - - "versions/GO_VERSION" pull_request: paths: - ".github/actions/docker-build/action.yaml" diff --git a/.github/workflows/dockers-benchmark-job-image.yml b/.github/workflows/dockers-benchmark-job-image.yml index 4ecd0e4b60..2d59b4356c 100644 --- a/.github/workflows/dockers-benchmark-job-image.yml +++ b/.github/workflows/dockers-benchmark-job-image.yml @@ -23,22 +23,6 @@ on: - "v*.*.*" - "*.*.*-*" - "v*.*.*-*" - paths: - - ".github/actions/docker-build/action.yaml" - - ".github/workflows/_docker-image.yaml" - - ".github/workflows/dockers-benchmak-job-image.yml" - - "go.mod" - - "go.sum" - - "internal/**" - - "!internal/**/*_test.go" - - "!internal/db/**" - - "apis/grpc/**" - - "pkg/tools/benchmark/operator/**" - - "cmd/tools/benchmark/operator/**" - - "pkg/tools/benchmark/job/**" - - "cmd/tools/benchmark/job/**" - - "dockers/tools/benchmark/job/Dockerfile" - - "versions/GO_VERSION" pull_request: paths: - ".github/actions/docker-build/action.yaml" diff --git a/.github/workflows/dockers-benchmark-operator-image.yaml b/.github/workflows/dockers-benchmark-operator-image.yaml index d56d0cd76f..2cc23d85b3 100644 --- a/.github/workflows/dockers-benchmark-operator-image.yaml +++ b/.github/workflows/dockers-benchmark-operator-image.yaml @@ -23,22 +23,6 @@ on: - "v*.*.*" - "*.*.*-*" - "v*.*.*-*" - paths: - - ".github/actions/docker-build/action.yaml" - - ".github/workflows/_docker-image.yaml" - - ".github/workflows/dockers-benchmak-operator-image.yml" - - "go.mod" - - "go.sum" - - "internal/**" - - "!internal/**/*_test.go" - - "!internal/db/**" - - "apis/grpc/**" - - "pkg/tools/benchmark/operator/**" - - "cmd/tools/benchmark/operator/**" - - "pkg/tools/benchmark/job/**" - - "cmd/tools/benchmark/job/**" - - "dockers/tools/benchmark/operator/Dockerfile" - - "versions/GO_VERSION" pull_request: paths: - ".github/actions/docker-build/action.yaml" diff --git a/.github/workflows/dockers-ci-container-image.yml b/.github/workflows/dockers-ci-container-image.yml index 8a77e749f3..2e0b034768 100644 --- a/.github/workflows/dockers-ci-container-image.yml +++ b/.github/workflows/dockers-ci-container-image.yml @@ -25,15 +25,6 @@ on: - "v*.*.*" - "*.*.*-*" - "v*.*.*-*" - paths: - - ".github/actions/docker-build/action.yaml" - - ".github/workflows/_docker-image.yaml" - - ".github/workflows/dockers-ci-container-image.yml" - - "dockers/ci/**" - - "Makefile" - - "Makefile.d/**" - - "versions/GO_VERSION" - - "versions/NGT_VERSION" pull_request: paths: - ".github/actions/docker-build/action.yaml" diff --git a/.github/workflows/dockers-dev-container-image.yml b/.github/workflows/dockers-dev-container-image.yml index 55d347d9a1..f9eae6c6ae 100644 --- a/.github/workflows/dockers-dev-container-image.yml +++ b/.github/workflows/dockers-dev-container-image.yml @@ -20,15 +20,6 @@ on: - "main" - "release/v*.*" - "!release/v*.*.*" - paths: - - ".github/actions/docker-build/action.yaml" - - ".github/workflows/_docker-image.yaml" - - ".github/workflows/dockers-dev-container-image.yml" - - "dockers/dev/**" - - "Makefile" - - "Makefile.d/**" - - "versions/GO_VERSION" - - "versions/NGT_VERSION" pull_request: paths: - ".github/actions/docker-build/action.yaml" diff --git a/.github/workflows/dockers-discoverer-k8s-image.yml b/.github/workflows/dockers-discoverer-k8s-image.yml index 91c42623ed..6612d9cf2d 100644 --- a/.github/workflows/dockers-discoverer-k8s-image.yml +++ b/.github/workflows/dockers-discoverer-k8s-image.yml @@ -25,20 +25,6 @@ on: - "v*.*.*" - "*.*.*-*" - "v*.*.*-*" - paths: - - ".github/actions/docker-build/action.yaml" - - ".github/workflows/_docker-image.yaml" - - ".github/workflows/dockers-discoverer-k8s-image.yml" - - "go.mod" - - "go.sum" - - "internal/**" - - "!internal/**/*_test.go" - - "!internal/db/**" - - "apis/grpc/**" - - "pkg/discoverer/k8s/**" - - "cmd/discoverer/k8s/**" - - "dockers/discoverer/k8s/Dockerfile" - - "versions/GO_VERSION" pull_request: paths: - ".github/actions/docker-build/action.yaml" diff --git a/.github/workflows/dockers-gateway-filter-image.yml b/.github/workflows/dockers-gateway-filter-image.yml index d0562e0092..94d9754912 100644 --- a/.github/workflows/dockers-gateway-filter-image.yml +++ b/.github/workflows/dockers-gateway-filter-image.yml @@ -25,23 +25,6 @@ on: - "v*.*.*" - "*.*.*-*" - "v*.*.*-*" - paths: - - ".github/actions/docker-build/action.yaml" - - ".github/workflows/_docker-image.yaml" - - ".github/workflows/dockers-gateway-filter-image.yml" - - "go.mod" - - "go.sum" - - "internal/**" - - "!internal/**/*_test.go" - - "!internal/**/*_mock.go" - - "!internal/db/**" - - "!internal/k8s/**" - - "apis/grpc/**" - - "pkg/gateway/filter/**" - - "cmd/gateway/filter/**" - - "pkg/gateway/internal/**" - - "dockers/gateway/filter/Dockerfile" - - "versions/GO_VERSION" pull_request: paths: - ".github/actions/docker-build/action.yaml" diff --git a/.github/workflows/dockers-gateway-lb-image.yml b/.github/workflows/dockers-gateway-lb-image.yml index f69bb599ee..a438eb29bf 100644 --- a/.github/workflows/dockers-gateway-lb-image.yml +++ b/.github/workflows/dockers-gateway-lb-image.yml @@ -25,23 +25,6 @@ on: - "v*.*.*" - "*.*.*-*" - "v*.*.*-*" - paths: - - ".github/actions/docker-build/action.yaml" - - ".github/workflows/_docker-image.yaml" - - ".github/workflows/dockers-gateway-lb-image.yml" - - "go.mod" - - "go.sum" - - "internal/**" - - "!internal/**/*_test.go" - - "!internal/**/*_mock.go" - - "!internal/db/**" - - "!internal/k8s/**" - - "apis/grpc/**" - - "pkg/gateway/lb/**" - - "cmd/gateway/lb/**" - - "pkg/gateway/internal/**" - - "dockers/gateway/lb/Dockerfile" - - "versions/GO_VERSION" pull_request: paths: - ".github/actions/docker-build/action.yaml" diff --git a/.github/workflows/dockers-gateway-mirror-image.yaml b/.github/workflows/dockers-gateway-mirror-image.yaml index 301fc6adcb..aeddaa45f0 100644 --- a/.github/workflows/dockers-gateway-mirror-image.yaml +++ b/.github/workflows/dockers-gateway-mirror-image.yaml @@ -23,22 +23,6 @@ on: - "v*.*.*" - "*.*.*-*" - "v*.*.*-*" - paths: - - ".github/actions/docker-build/action.yaml" - - ".github/workflows/dockers-gateway-mirror-image.yml" - - "go.mod" - - "go.sum" - - "internal/**" - - "!internal/**/*_test.go" - - "!internal/**/*_mock.go" - - "!internal/db/**" - - "!internal/k8s/**" - - "apis/grpc/**" - - "pkg/gateway/mirror/**" - - "cmd/gateway/mirror/**" - - "pkg/gateway/internal/**" - - "dockers/gateway/mirror/Dockerfile" - - "versions/GO_VERSION" pull_request: paths: - ".github/actions/docker-build/action.yaml" diff --git a/.github/workflows/dockers-helm-operator-image.yml b/.github/workflows/dockers-helm-operator-image.yml index b27f3106ab..3b36c307f7 100644 --- a/.github/workflows/dockers-helm-operator-image.yml +++ b/.github/workflows/dockers-helm-operator-image.yml @@ -25,18 +25,6 @@ on: - "v*.*.*" - "*.*.*-*" - "v*.*.*-*" - paths: - - ".github/actions/docker-build/action.yaml" - - ".github/workflows/_docker-image.yaml" - - ".github/workflows/dockers-helm-operator-image.yml" - - "dockers/operator/helm/Dockerfile" - - "charts/vald/Chart.yaml" - - "charts/vald/values.yaml" - - "charts/vald/templates/**" - - "charts/vald-helm-operator/Chart.yaml" - - "charts/vald-helm-operator/values.yaml" - - "charts/vald-helm-operator/templates/**" - - "versions/OPERATOR_SDK_VERSION" pull_request: paths: - ".github/actions/docker-build/action.yaml" diff --git a/.github/workflows/dockers-index-correction.yml b/.github/workflows/dockers-index-correction.yml index 9187b487a2..c1bb1b8a29 100644 --- a/.github/workflows/dockers-index-correction.yml +++ b/.github/workflows/dockers-index-correction.yml @@ -23,20 +23,6 @@ on: - "v*.*.*" - "*.*.*-*" - "v*.*.*-*" - paths: - - ".github/actions/docker-build/action.yaml" - - ".github/workflows/dockers-index-correction.yml" - - "go.mod" - - "go.sum" - - "internal/**" - - "!internal/**/*_test.go" - - "!internal/db/**" - - "!internal/k8s/**" - - "apis/grpc/**" - - "pkg/index/job/correction/**" - - "cmd/index/job/correction/**" - - "dockers/index/job/correction/Dockerfile" - - "versions/GO_VERSION" pull_request: paths: - ".github/actions/docker-build/action.yaml" diff --git a/.github/workflows/dockers-index-creation.yml b/.github/workflows/dockers-index-creation.yml index 90a49ee2a1..531e16aedf 100644 --- a/.github/workflows/dockers-index-creation.yml +++ b/.github/workflows/dockers-index-creation.yml @@ -23,20 +23,6 @@ on: - "v*.*.*" - "*.*.*-*" - "v*.*.*-*" - paths: - - ".github/actions/docker-build/action.yaml" - - ".github/workflows/dockers-index-creation.yml" - - "go.mod" - - "go.sum" - - "internal/**" - - "!internal/**/*_test.go" - - "!internal/db/**" - - "!internal/k8s/**" - - "apis/grpc/**" - - "pkg/index/job/creation/**" - - "cmd/index/job/creation/**" - - "dockers/index/job/creation/Dockerfile" - - "versions/GO_VERSION" pull_request: paths: - ".github/actions/docker-build/action.yaml" diff --git a/.github/workflows/dockers-index-operator.yml b/.github/workflows/dockers-index-operator.yml index 5494d85e2f..fcc748d63e 100644 --- a/.github/workflows/dockers-index-operator.yml +++ b/.github/workflows/dockers-index-operator.yml @@ -23,20 +23,6 @@ on: - "v*.*.*" - "*.*.*-*" - "v*.*.*-*" - paths: - - ".github/actions/docker-build/action.yaml" - - ".github/workflows/dockers-index-operator.yml" - - "go.mod" - - "go.sum" - - "internal/**" - - "!internal/**/*_test.go" - - "!internal/db/**" - - "internal/k8s/**" - - "apis/grpc/**" - - "pkg/index/operator/**" - - "cmd/index/operator/**" - - "dockers/index/operator/Dockerfile" - - "versions/GO_VERSION" pull_request: paths: - ".github/actions/docker-build/action.yaml" diff --git a/.github/workflows/dockers-index-save.yml b/.github/workflows/dockers-index-save.yml index 7ee1509498..4669b534bf 100644 --- a/.github/workflows/dockers-index-save.yml +++ b/.github/workflows/dockers-index-save.yml @@ -23,20 +23,6 @@ on: - "v*.*.*" - "*.*.*-*" - "v*.*.*-*" - paths: - - ".github/actions/docker-build/action.yaml" - - ".github/workflows/dockers-index-save.yml" - - "go.mod" - - "go.sum" - - "internal/**" - - "!internal/**/*_test.go" - - "!internal/db/**" - - "!internal/k8s/**" - - "apis/grpc/**" - - "pkg/index/job/save/**" - - "cmd/index/job/save/**" - - "dockers/index/job/save/Dockerfile" - - "versions/GO_VERSION" pull_request: paths: - ".github/actions/docker-build/action.yaml" diff --git a/.github/workflows/dockers-loadtest-image.yml b/.github/workflows/dockers-loadtest-image.yml index 5abb15ad7b..75e84f4cd2 100644 --- a/.github/workflows/dockers-loadtest-image.yml +++ b/.github/workflows/dockers-loadtest-image.yml @@ -25,21 +25,6 @@ on: - "v*.*.*" - "*.*.*-*" - "v*.*.*-*" - paths: - - ".github/actions/docker-build/action.yaml" - - ".github/workflows/_docker-image.yaml" - - ".github/workflows/dockers-loadtest-image.yml" - - "go.mod" - - "go.sum" - - "internal/**" - - "!internal/**/*_test.go" - - "!internal/db/**" - - "!internal/k8s/**" - - "apis/grpc/**" - - "pkg/tools/cli/loadtest/**" - - "cmd/tools/cli/loadtest/**" - - "dockers/tools/cli/loadtest/Dockerfile" - - "versions/GO_VERSION" pull_request: paths: - ".github/actions/docker-build/action.yaml" diff --git a/.github/workflows/dockers-manager-index-image.yml b/.github/workflows/dockers-manager-index-image.yml index 334a60dfa6..774979664c 100644 --- a/.github/workflows/dockers-manager-index-image.yml +++ b/.github/workflows/dockers-manager-index-image.yml @@ -25,21 +25,6 @@ on: - "v*.*.*" - "*.*.*-*" - "v*.*.*-*" - paths: - - ".github/actions/docker-build/action.yaml" - - ".github/workflows/_docker-image.yaml" - - ".github/workflows/dockers-manager-index-image.yml" - - "go.mod" - - "go.sum" - - "internal/**" - - "!internal/**/*_test.go" - - "!internal/db/**" - - "!internal/k8s/**" - - "apis/grpc/**" - - "pkg/manager/index/**" - - "cmd/manager/index/**" - - "dockers/manager/index/Dockerfile" - - "versions/GO_VERSION" pull_request: paths: - ".github/actions/docker-build/action.yaml" diff --git a/.github/workflows/dockers-readreplica-rotate.yml b/.github/workflows/dockers-readreplica-rotate.yml index 23019dc82c..724e88a3f1 100644 --- a/.github/workflows/dockers-readreplica-rotate.yml +++ b/.github/workflows/dockers-readreplica-rotate.yml @@ -23,20 +23,6 @@ on: - "v*.*.*" - "*.*.*-*" - "v*.*.*-*" - paths: - - ".github/actions/docker-build/action.yaml" - - ".github/workflows/dockers-readreplica-rotate.yml" - - "go.mod" - - "go.sum" - - "internal/**" - - "!internal/**/*_test.go" - - "!internal/db/**" - - "internal/k8s/**" - - "apis/grpc/**" - - "pkg/index/job/readreplica/rotate/**" - - "cmd/index/job/readreplica/rotate/**" - - "dockers/index/job/readreplica/rotate/Dockerfile" - - "versions/GO_VERSION" pull_request: paths: - ".github/actions/docker-build/action.yaml"