Reenable macOS signing and notarization (#7112)

This commit is contained in:
Michał Wawrzyniec Urbańczyk 2023-06-23 03:47:39 +02:00 committed by GitHub
parent 3937d21001
commit 64204a1b3c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 7 deletions

View File

@ -590,6 +590,7 @@ jobs:
APPLEIDPASS: ${{ secrets.APPLE_NOTARIZATION_PASSWORD }} APPLEIDPASS: ${{ secrets.APPLE_NOTARIZATION_PASSWORD }}
CSC_IDENTITY_AUTO_DISCOVERY: "true" CSC_IDENTITY_AUTO_DISCOVERY: "true"
CSC_KEY_PASSWORD: ${{ secrets.APPLE_CODE_SIGNING_CERT_PASSWORD }} CSC_KEY_PASSWORD: ${{ secrets.APPLE_CODE_SIGNING_CERT_PASSWORD }}
CSC_LINK: ${{ secrets.APPLE_CODE_SIGNING_CERT }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- if: failure() && runner.os == 'Windows' - if: failure() && runner.os == 'Windows'
name: List files if failed (Windows) name: List files if failed (Windows)

View File

@ -625,6 +625,7 @@ jobs:
APPLEIDPASS: ${{ secrets.APPLE_NOTARIZATION_PASSWORD }} APPLEIDPASS: ${{ secrets.APPLE_NOTARIZATION_PASSWORD }}
CSC_IDENTITY_AUTO_DISCOVERY: "true" CSC_IDENTITY_AUTO_DISCOVERY: "true"
CSC_KEY_PASSWORD: ${{ secrets.APPLE_CODE_SIGNING_CERT_PASSWORD }} CSC_KEY_PASSWORD: ${{ secrets.APPLE_CODE_SIGNING_CERT_PASSWORD }}
CSC_LINK: ${{ secrets.APPLE_CODE_SIGNING_CERT }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- if: failure() && runner.os == 'Windows' - if: failure() && runner.os == 'Windows'
name: List files if failed (Windows) name: List files if failed (Windows)

View File

@ -193,13 +193,10 @@ pub fn expose_os_specific_signing_secret(os: OS, step: Step) -> Step {
&crate::ide::web::env::WIN_CSC_KEY_PASSWORD, &crate::ide::web::env::WIN_CSC_KEY_PASSWORD,
), ),
OS::MacOS => step OS::MacOS => step
// This temporarily disables notarization and code signing. .with_secret_exposed_as(
// Should be uncommented, once https://github.com/enso-org/enso/issues/7091 is secret::APPLE_CODE_SIGNING_CERT,
// addressed. &crate::ide::web::env::CSC_LINK,
// .with_secret_exposed_as( )
// secret::APPLE_CODE_SIGNING_CERT,
// &crate::ide::web::env::CSC_LINK,
// )
.with_secret_exposed_as( .with_secret_exposed_as(
secret::APPLE_CODE_SIGNING_CERT_PASSWORD, secret::APPLE_CODE_SIGNING_CERT_PASSWORD,
&crate::ide::web::env::CSC_KEY_PASSWORD, &crate::ide::web::env::CSC_KEY_PASSWORD,