diff --git a/.github/workflows/deb-publish.yml b/.github/workflows/deb-publish.yml index 5e15e989..45959be8 100644 --- a/.github/workflows/deb-publish.yml +++ b/.github/workflows/deb-publish.yml @@ -157,7 +157,7 @@ jobs: fi REPO_ROOT="$MOUNTPOINT/public_html" mkdir -p "$REPO_ROOT" - if [ -n "${{ secrets.GPG_SECRET_SUBKEYS }}" ]; then + if [ "${{ steps.gpg.conclusion }}" != "skipped" ]; then cp -f /etc/apt/trusted.gpg.d/apt.bcachefs.org.asc "$REPO_ROOT" fi cat > "$REPO_ROOT/README.txt" < "/etc/apt/sources.list.d/apt.bcachefs.org.sources" < /etc/apt/sources.list.d/apt.bcachefs.org.sources < "/etc/apt/preferences.d/apt.bcachefs.org.pref " < /etc/apt/preferences.d/apt.bcachefs.org.pref <`, - over `Pin: release o=`, because pinning by origin + Note that yes, you should always prefer "Pin: origin ", + over "Pin: release o=", because pinning by origin will *actually* pin by the full hostname of APT repository, - whereas any repository can claim anything in it's `Origin: ` field, + whereas any repository can claim anything in it's "Origin: " field, and thus pinning by origin label is inherently insecure!