felixfoertsch/syncthing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 10 Wiki Activity

avoid daemon default keychain write
custom release / build-custom-release (push) Failing after 9s
Details

Browse Source
This commit is contained in:
felixfoertsch
2026-05-24 20:04:35 +02:00
parent 0dba7d9d9e
commit 623d697e66
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitea/workflows/custom-release.yml
+1 -3
View File
@@ -60,7 +60,7 @@ jobs:
keychain_path="$keychain_dir/syncthing-release-signing-${GITHUB_RUN_ID:-$$}.keychain-db" keychain_path="$keychain_dir/syncthing-release-signing-${GITHUB_RUN_ID:-$$}.keychain-db"
keychain_password="$(openssl rand -hex 24)" keychain_password="$(openssl rand -hex 24)"
certificate_path="$RUNNER_TEMP/developer-id-application.p12" certificate_path="$RUNNER_TEMP/developer-id-application.p12"
previous_default_keychain="$(security default-keychain 2>/dev/null | sed 's/[ "]//g' || true)" previous_default_keychain="$(security default-keychain -d user 2>/dev/null | sed 's/[ "]//g' || true)"
echo "CUSTOM_RELEASE_KEYCHAIN_PATH=$keychain_path" >> "$GITHUB_ENV" echo "CUSTOM_RELEASE_KEYCHAIN_PATH=$keychain_path" >> "$GITHUB_ENV"
echo "CUSTOM_RELEASE_KEYCHAIN_PASSWORD=$keychain_password" >> "$GITHUB_ENV" echo "CUSTOM_RELEASE_KEYCHAIN_PASSWORD=$keychain_password" >> "$GITHUB_ENV"
@@ -86,7 +86,6 @@ jobs:
done < <(security list-keychains) done < <(security list-keychains)
security list-keychains -s "$keychain_path" "${existing_keychains[@]}" security list-keychains -s "$keychain_path" "${existing_keychains[@]}"
security list-keychains -d user -s "$keychain_path" "${existing_keychains[@]}" || true security list-keychains -d user -s "$keychain_path" "${existing_keychains[@]}" || true
security default-keychain -s "$keychain_path"
security default-keychain -d user -s "$keychain_path" || true security default-keychain -d user -s "$keychain_path" || true
security list-keychains security list-keychains
security list-keychains -d user || true security list-keychains -d user || true
@@ -128,7 +127,6 @@ jobs:
if: always() if: always()
run: | run: |
if [ -n "${CUSTOM_RELEASE_PREVIOUS_DEFAULT_KEYCHAIN:-}" ] && [ -e "$CUSTOM_RELEASE_PREVIOUS_DEFAULT_KEYCHAIN" ]; then if [ -n "${CUSTOM_RELEASE_PREVIOUS_DEFAULT_KEYCHAIN:-}" ] && [ -e "$CUSTOM_RELEASE_PREVIOUS_DEFAULT_KEYCHAIN" ]; then
security default-keychain -s "$CUSTOM_RELEASE_PREVIOUS_DEFAULT_KEYCHAIN" || true
security default-keychain -d user -s "$CUSTOM_RELEASE_PREVIOUS_DEFAULT_KEYCHAIN" || true security default-keychain -d user -s "$CUSTOM_RELEASE_PREVIOUS_DEFAULT_KEYCHAIN" || true
fi fi
if [ -n "${CUSTOM_RELEASE_KEYCHAIN_PATH:-}" ]; then if [ -n "${CUSTOM_RELEASE_KEYCHAIN_PATH:-}" ]; then
scripts/tests/test-custom-release-macos-runner.bats
+2 -2
View File
@@ -47,7 +47,7 @@ setup() {
run rg -n 'security find-identity -v -p codesigning "\$keychain_path"' "$WORKFLOW" run rg -n 'security find-identity -v -p codesigning "\$keychain_path"' "$WORKFLOW"
[ "$status" -eq 0 ] [ "$status" -eq 0 ]
run rg -n 'security default-keychain -s "\$keychain_path"' "$WORKFLOW" run rg -n 'security default-keychain -d user -s "\$keychain_path"' "$WORKFLOW"
[ "$status" -eq 0 ] [ "$status" -eq 0 ]
run rg -n 'previous_default_keychain=' "$WORKFLOW" run rg -n 'previous_default_keychain=' "$WORKFLOW"
@@ -60,7 +60,7 @@ setup() {
[ "$status" -ne 0 ] [ "$status" -ne 0 ]
run rg -n 'security default-keychain -s "\$CUSTOM_RELEASE_PREVIOUS_DEFAULT_KEYCHAIN"' "$WORKFLOW" run rg -n 'security default-keychain -s "\$CUSTOM_RELEASE_PREVIOUS_DEFAULT_KEYCHAIN"' "$WORKFLOW"
[ "$status" -eq 0 ] [ "$status" -ne 0 ]
run rg -n 'security default-keychain -d dynamic' "$WORKFLOW" run rg -n 'security default-keychain -d dynamic' "$WORKFLOW"
[ "$status" -ne 0 ] [ "$status" -ne 0 ]