Merge pull request #18667 from Homebrew/pkg-installer-template-injection

workflows/pkg-installer: fix `template-injection` warnings
This commit is contained in:
Bo Anderson 2024-10-30 17:18:53 +00:00 committed by GitHub
commit 44608084a7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -96,12 +96,14 @@ jobs:
run: security list-keychain -d user -s "${RUNNER_TEMP}/${TEMPORARY_KEYCHAIN_FILE}" run: security list-keychain -d user -s "${RUNNER_TEMP}/${TEMPORARY_KEYCHAIN_FILE}"
- name: Build Homebrew installer component package - name: Build Homebrew installer component package
env:
HOMEBREW_VERSION: ${{ steps.homebrew-version.outputs.version }}
# Note: `Library/Homebrew/test/support/fixtures/` contains unsigned # Note: `Library/Homebrew/test/support/fixtures/` contains unsigned
# binaries so it needs to be excluded from notarization. # binaries so it needs to be excluded from notarization.
run: pkgbuild --root brew run: pkgbuild --root brew
--scripts brew/package/scripts --scripts brew/package/scripts
--identifier sh.brew.homebrew --identifier sh.brew.homebrew
--version "${{ steps.homebrew-version.outputs.version }}" --version "${HOMEBREW_VERSION}"
--install-location /opt/homebrew --install-location /opt/homebrew
--filter .DS_Store --filter .DS_Store
--filter "(.*)/Library/Homebrew/test/support/fixtures/" --filter "(.*)/Library/Homebrew/test/support/fixtures/"
@ -114,11 +116,13 @@ jobs:
pandoc --from markdown --standalone --output brew/package/resources/LICENSE.rtf pandoc --from markdown --standalone --output brew/package/resources/LICENSE.rtf
- name: Build Homebrew installer product package - name: Build Homebrew installer product package
env:
HOMEBREW_VERSION: ${{ steps.homebrew-version.outputs.version }}
run: productbuild --resources brew/package/resources run: productbuild --resources brew/package/resources
--distribution brew/package/Distribution.xml --distribution brew/package/Distribution.xml
--package-path Homebrew.pkg --package-path Homebrew.pkg
--sign "${PKG_APPLE_DEVELOPER_TEAM_ID}" --sign "${PKG_APPLE_DEVELOPER_TEAM_ID}"
Homebrew-${{ steps.homebrew-version.outputs.version }}.pkg "Homebrew-${HOMEBREW_VERSION}.pkg"
- name: Clean up temporary macOS keychain - name: Clean up temporary macOS keychain
if: ${{ always() }} if: ${{ always() }}
@ -173,7 +177,9 @@ jobs:
run: echo | sudo tee /var/log/install.log run: echo | sudo tee /var/log/install.log
- name: Install Homebrew from installer package - name: Install Homebrew from installer package
run: sudo installer -verbose -pkg "${{ needs.build.outputs.installer_path }}" -target / env:
INSTALLER_PATH: ${{ needs.build.outputs.installer_path }}
run: sudo installer -verbose -pkg "${INSTALLER_PATH}" -target /
- name: Output installer logs - name: Output installer logs
if: ${{ always() }} if: ${{ always() }}
@ -187,7 +193,9 @@ jobs:
run: echo | sudo tee /var/log/install.log run: echo | sudo tee /var/log/install.log
- name: Reinstall Homebrew from installer package - name: Reinstall Homebrew from installer package
run: sudo installer -verbose -pkg "${{ needs.build.outputs.installer_path }}" -target / env:
INSTALLER_PATH: ${{ needs.build.outputs.installer_path }}
run: sudo installer -verbose -pkg "${INSTALLER_PATH}" -target /
- name: Output installer logs (again) - name: Output installer logs (again)
if: ${{ always() }} if: ${{ always() }}
@ -213,7 +221,8 @@ jobs:
env: env:
PKG_APPLE_ID_EMAIL: ${{ secrets.PKG_APPLE_ID_EMAIL }} PKG_APPLE_ID_EMAIL: ${{ secrets.PKG_APPLE_ID_EMAIL }}
PKG_APPLE_ID_APP_SPECIFIC_PASSWORD: ${{ secrets.PKG_APPLE_ID_APP_SPECIFIC_PASSWORD }} PKG_APPLE_ID_APP_SPECIFIC_PASSWORD: ${{ secrets.PKG_APPLE_ID_APP_SPECIFIC_PASSWORD }}
run: xcrun notarytool submit "${{ needs.build.outputs.installer_path }}" INSTALLER_PATH: ${{ needs.build.outputs.installer_path }}
run: xcrun notarytool submit "${INSTALLER_PATH}"
--team-id "${PKG_APPLE_DEVELOPER_TEAM_ID}" --team-id "${PKG_APPLE_DEVELOPER_TEAM_ID}"
--apple-id "${PKG_APPLE_ID_EMAIL}" --apple-id "${PKG_APPLE_ID_EMAIL}"
--password "${PKG_APPLE_ID_APP_SPECIFIC_PASSWORD}" --password "${PKG_APPLE_ID_APP_SPECIFIC_PASSWORD}"
@ -226,9 +235,10 @@ jobs:
if: github.event_name == 'release' if: github.event_name == 'release'
env: env:
GH_TOKEN: ${{ github.token }} GH_TOKEN: ${{ github.token }}
INSTALLER_PATH: ${{ needs.build.outputs.installer_path }}
run: gh release upload --repo Homebrew/brew run: gh release upload --repo Homebrew/brew
"${GITHUB_REF//refs\/tags\//}" "${GITHUB_REF//refs\/tags\//}"
"${{ needs.build.outputs.installer_path }}" "${INSTALLER_PATH}"
issue: issue:
needs: [build, test, upload] needs: [build, test, upload]