Merge pull request #5903 from apache/delivery

Sync GitHub workflows fix from delivery to release180