diff options
| author | Jonathan <jonathan@mullvad.net> | 2023-06-09 16:35:33 +0200 |
|---|---|---|
| committer | Jonathan <jonathan@mullvad.net> | 2023-06-09 16:35:33 +0200 |
| commit | e528b137273d6f00b1cdf45a809a5fed4a7de87c (patch) | |
| tree | cadc41f018ffd2fbd5493670bd6e0b9c67d2eb77 | |
| parent | 75a2c206f844650d9993f4a4a0264f8c98acd5d4 (diff) | |
| parent | 14750db87c3b98010cb9b0027a5f61e5075e8145 (diff) | |
| download | mullvadvpn-e528b137273d6f00b1cdf45a809a5fed4a7de87c.tar.xz mullvadvpn-e528b137273d6f00b1cdf45a809a5fed4a7de87c.zip | |
Merge branch 'ci-lockfiles-always-complained-about'
| -rw-r--r-- | .github/workflows/verify-locked-down-signatures.yml | 1 | ||||
| -rwxr-xr-x | ci/verify-locked-down-signatures.sh | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/.github/workflows/verify-locked-down-signatures.yml b/.github/workflows/verify-locked-down-signatures.yml index b246910c87..e8afcbc99c 100644 --- a/.github/workflows/verify-locked-down-signatures.yml +++ b/.github/workflows/verify-locked-down-signatures.yml @@ -30,4 +30,5 @@ jobs: base_ref=${{ github.event.pull_request.base.sha }} head_ref=${{ github.event.pull_request.head.sha }} git fetch --no-recurse-submodules --shallow-exclude=main origin main $base_ref $head_ref + git fetch --deepen=1 ci/verify-locked-down-signatures.sh --import-gpg-keys --whitelist origin/main diff --git a/ci/verify-locked-down-signatures.sh b/ci/verify-locked-down-signatures.sh index 82bad80073..56501f2993 100755 --- a/ci/verify-locked-down-signatures.sh +++ b/ci/verify-locked-down-signatures.sh @@ -67,7 +67,7 @@ for locked_path in $locked_down_paths; do "$REPO_DIR/$locked_path" | awk '{print $1}') for commit in $locked_path_commit_hashes; do - echo -e "\tin $commit.." + echo -e "\tfound a change in $commit.." if ! git verify-commit "$commit" 2> /dev/null; then echo "Commit $commit which changed $locked_path is not signed." unsigned_commits_exist=1 |