From b1d397ff8b46ff10a8afdaf41c4ce3bc7f071b2f Mon Sep 17 00:00:00 2001 From: Igor Karpukhin Date: Wed, 20 Apr 2022 21:03:16 +0200 Subject: [PATCH 1/4] Bumped up golang.org/x/crypto/ssh --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 267dd24613..758f16b74c 100644 --- a/go.mod +++ b/go.mod @@ -82,7 +82,7 @@ require ( github.com/youmark/pkcs8 v0.0.0-20201027041543-1326539a0a0a // indirect go.uber.org/atomic v1.9.0 // indirect go.uber.org/multierr v1.7.0 // indirect - golang.org/x/crypto v0.0.0-20220214200702-86341886e292 // indirect + golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4 // indirect golang.org/x/net v0.0.0-20220225172249-27dd8689420f // indirect golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b // indirect golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect diff --git a/go.sum b/go.sum index 447d3dd7e7..bd86dd48e7 100644 --- a/go.sum +++ b/go.sum @@ -637,6 +637,8 @@ golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5y golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.0.0-20220214200702-86341886e292 h1:f+lwQ+GtmgoY+A2YaQxlSOnDjXcQ7ZRLWOHbC6HtRqE= golang.org/x/crypto v0.0.0-20220214200702-86341886e292/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= +golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4 h1:kUhD7nTDoI3fVd9G4ORWrbV5NY0liEs/Jg2pv5f+bBA= +golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= From fd094b0fbd17697267c4bd9c999b14f1624e9474 Mon Sep 17 00:00:00 2001 From: Igor Karpukhin Date: Thu, 21 Apr 2022 10:23:51 +0200 Subject: [PATCH 2/4] Fixed git set tag --- .github/workflows/test.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 37e596ca1d..7e32a5ef93 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -166,6 +166,9 @@ jobs: # Make sure we also get the helm-charts submodule! submodules: recursive + - name: Add permissions + run: git config --global --add safe.directory /github/workspace + - name: Prepare tag id: prepare uses: ./.github/actions/set-tag From 7d23776aab80b11ff6d25c2e86a0b5081dc00127 Mon Sep 17 00:00:00 2001 From: Igor Karpukhin Date: Thu, 21 Apr 2022 10:58:19 +0200 Subject: [PATCH 3/4] Fixed checkout action version --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 7e32a5ef93..f64e3fef15 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -161,7 +161,7 @@ jobs: steps: - name: Check out code - uses: actions/checkout@v3.0.0 + uses: actions/checkout@v3 with: # Make sure we also get the helm-charts submodule! submodules: recursive From 23361b04c396b84ea813f2225978b11c97b8391b Mon Sep 17 00:00:00 2001 From: Igor Karpukhin Date: Thu, 21 Apr 2022 11:25:54 +0200 Subject: [PATCH 4/4] Fixed set-tag --- .github/actions/set-tag/entrypoint.sh | 4 +++- .github/workflows/test.yml | 3 --- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/actions/set-tag/entrypoint.sh b/.github/actions/set-tag/entrypoint.sh index c415072f78..5174bfc2c5 100644 --- a/.github/actions/set-tag/entrypoint.sh +++ b/.github/actions/set-tag/entrypoint.sh @@ -2,6 +2,8 @@ #set -eou pipefail +git config --global --add safe.directory /github/workspace + # Setup tag name commit_id=$(git rev-parse --short HEAD) branch_name=${GITHUB_HEAD_REF-} @@ -10,4 +12,4 @@ if [ -z "${branch_name}" ]; then fi branch_name=$(echo "${branch_name}" | awk '{print substr($0, 1, 15)}' | sed 's/\//-/g') tag="${branch_name}-${commit_id}" -echo "::set-output name=tag::$tag" \ No newline at end of file +echo "::set-output name=tag::$tag" diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index f64e3fef15..56377023d9 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -166,9 +166,6 @@ jobs: # Make sure we also get the helm-charts submodule! submodules: recursive - - name: Add permissions - run: git config --global --add safe.directory /github/workspace - - name: Prepare tag id: prepare uses: ./.github/actions/set-tag