Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add WebAuthn support in entitlements and fix provisioning profile cop… #4601

Merged
merged 57 commits into from
Jan 29, 2025
Merged
Show file tree
Hide file tree
Changes from 16 commits
Commits
Show all changes
57 commits
Select commit Hold shift + click to select a range
ce7c1f7
Refactor macOS build workflow and remove deprecated entitlements files
mauro-balades Jan 23, 2025
83f8975
Update macOS build workflow to include mac dependency and modify Fire…
mauro-balades Jan 23, 2025
f6bad14
Update @zen-browser/surfer dependency to version 1.9.9
mauro-balades Jan 23, 2025
ea0a808
Update @zen-browser/surfer dependency to version 1.9.10
mauro-balades Jan 23, 2025
a640509
Enhance macOS build workflows by renaming artifact paths and adding a…
mauro-balades Jan 23, 2025
c3f22ec
Update macOS build workflow to specify artifact download paths for ar…
mauro-balades Jan 23, 2025
3972f3e
Fixed glance opening on essential tabs even if it's disabled (closes …
mauro-balades Jan 23, 2025
5f7fcd5
Fix quoting for environment variable expansion in macOS build workflow
mauro-balades Jan 23, 2025
a09f3ab
Limit search depth for .app folders and refine APP_NAME extraction in…
mauro-balades Jan 23, 2025
0def2c2
Update macos-universal-release-build.yml
mauro-balades Jan 24, 2025
22a042d
Refine APP_NAME extraction and add verification step in macOS build w…
mauro-balades Jan 24, 2025
ac600ad
Remove redundant APP_NAME verification step in macOS build workflow
mauro-balades Jan 24, 2025
952385f
Fix quoting for APP_NAME environment variable in macOS build workflow
mauro-balades Jan 24, 2025
ca4952c
Add build ID generation and pass to build workflows
mauro-balades Jan 24, 2025
504faad
Refactor macOS build workflows to improve artifact handling and extra…
mauro-balades Jan 25, 2025
c67440a
Fix variable reference in artifact packaging step of macOS build work…
mauro-balades Jan 25, 2025
a724f9c
Discard changes to src/browser/base/zen-components/ZenGlanceManager.mjs
mauro-balades Jan 25, 2025
abedcd8
Remove emoji from extract step name in macOS build workflow
mauro-balades Jan 25, 2025
9c96275
Merge branch 'macos-signing-fix' of https://github.com/zen-browser/de…
mauro-balades Jan 25, 2025
7fc4c03
Change event listener from 'MozAfterPaint' to 'DOMContentLoaded' for …
mauro-balades Jan 25, 2025
9850c97
Refactor macOS build workflow to improve artifact packaging process
mauro-balades Jan 25, 2025
9ebfc97
Add set -ex to macOS build workflow for improved error handling durin…
mauro-balades Jan 25, 2025
d41f0d7
Add directory change to macOS build workflow before extracting .app f…
mauro-balades Jan 25, 2025
74a4d98
Update macOS build workflow to use wildcard for DMG file attachment
mauro-balades Jan 25, 2025
ac53d73
Refactor macOS build workflow to streamline .app extraction from DMG …
mauro-balades Jan 25, 2025
b863045
Rename extract_dmg to unpack_dmg in macOS build workflow and fix newl…
mauro-balades Jan 25, 2025
df745e1
Remove generation of EventArtifactDefinitions.json from telemetry bui…
mauro-balades Jan 26, 2025
9c5ae70
Remove generation of ScalarArtifactDefinitions.json from telemetry bu…
mauro-balades Jan 26, 2025
d9939ea
Refactor macOS build workflow to remove specific .app cleanup and del…
mauro-balades Jan 26, 2025
d3f14bd
Refactor macOS build workflows to unify artifact naming and update de…
mauro-balades Jan 26, 2025
9b79e3c
Update macOS release build workflow to move all DMG files to a unifie…
mauro-balades Jan 26, 2025
d548b8c
Remove unnecessary directory change in artifact renaming step
mauro-balades Jan 26, 2025
53e015a
Update @zen-browser/surfer dependency to version 1.9.13
mauro-balades Jan 27, 2025
dd7233c
Update macos-universal-release-build.yml
mauro-balades Jan 27, 2025
1d9c2f8
Fixed macos signing command
mauro-balades Jan 27, 2025
c6a92c2
Update macos-universal-release-build.yml
mauro-balades Jan 27, 2025
b82b032
Fix path in macOS universal release build workflow for artifact location
mauro-balades Jan 27, 2025
ca57fa3
Update @zen-browser/surfer dependency to version 1.9.14
mauro-balades Jan 27, 2025
f9ec71b
Add support for uploading and downloading host mar artifact in macOS …
mauro-balades Jan 27, 2025
d69cc7e
Update cron schedule for candidate release check workflow
mauro-balades Jan 27, 2025
af24ff6
Cleanup macOS build workflow by removing unnecessary directory and ad…
mauro-balades Jan 28, 2025
00682ed
Update macos-universal-release-build.yml
mauro-balades Jan 28, 2025
c19748b
Update @zen-browser/surfer dependency to version 1.9.15 and refine ma…
mauro-balades Jan 28, 2025
8d2e0b0
Add support for updating the l10n last commit hash and new script option
mauro-balades Jan 28, 2025
b2d4766
Update @zen-browser/surfer dependency to version 1.9.16 and adjust ma…
mauro-balades Jan 28, 2025
fea9987
Update macOS signing command to use production entitlements and adjus…
mauro-balades Jan 28, 2025
d32950a
Refactor macOS signing command to remove Firefox condition from entit…
mauro-balades Jan 28, 2025
7f99691
Uploading platform.init
mauro-balades Jan 29, 2025
a3e1033
Fixed macos signing
mauro-balades Jan 29, 2025
8d15619
Refactor macOS signing command to support notarization and adjust emb…
mauro-balades Jan 29, 2025
c684563
Merge branch 'macos-signing-fix' of https://github.com/zen-browser/de…
mauro-balades Jan 29, 2025
f580e53
Reorder steps in macOS release build workflow to copy provisioning pr…
mauro-balades Jan 29, 2025
30f1def
Update macOS signing script to support notarization and adjust provis…
mauro-balades Jan 29, 2025
9870047
Update macOS signing command to use 'production-without-restricted' e…
mauro-balades Jan 29, 2025
6d9fd13
Discard changes to configs/macos/mozconfig
mauro-balades Jan 29, 2025
175d12c
Discard changes to src/browser/base/zen-components/ZenGlanceManager.mjs
mauro-balades Jan 29, 2025
6e5a56b
Discard changes to pnpm-lock.yaml
mauro-balades Jan 29, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 32 additions & 5 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,18 @@ jobs:
echo "GITHUB_REPOSITORY_OWNER: ${{ github.repository_owner }}"
echo "GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}"

buildid:
name: Generate build ID
runs-on: ubuntu-latest
outputs:
buildids: ${{ steps.get.outputs.bid }}
steps:
- id: get
shell: bash -xe {0}
run: |
bdat=`date +"%Y%m%d%I%M%S"`
echo "bid=${bdat}" >> $GITHUB_OUTPUT

start-self-host:
runs-on: ubuntu-latest
needs: debug-inputs
Expand Down Expand Up @@ -294,7 +306,7 @@ jobs:
windows-step-1:
name: Windows build step 1 (PGO build)
uses: ./.github/workflows/windows-release-build.yml
needs: [build-data]
needs: [build-data, buildid]
permissions:
contents: write
secrets: inherit
Expand All @@ -303,6 +315,7 @@ jobs:
generate-gpo: true
profile-data-path-archive: zen-windows-profile-data-and-jarlog.zip
release-branch: ${{ inputs.update_branch }}
MOZ_BUILD_DATE: ${{needs.buildid.outputs.buildids}}

windows-step-2:
name: Windows build step 2 (Generate profile data)
Expand All @@ -322,30 +335,44 @@ jobs:
permissions:
contents: write
secrets: inherit
needs: [build-data, windows-step-2, start-self-host]
needs: [build-data, windows-step-2, start-self-host, buildid]
with:
build-version: ${{ needs.build-data.outputs.version }}
generate-gpo: false
release-branch: ${{ inputs.update_branch }}
MOZ_BUILD_DATE: ${{needs.buildid.outputs.buildids}}

linux:
name: Linux build
uses: ./.github/workflows/linux-release-build.yml
permissions:
contents: write
secrets: inherit
needs: [build-data, start-self-host]
needs: [build-data, start-self-host, buildid]
with:
build-version: ${{ needs.build-data.outputs.version }}
release-branch: ${{ inputs.update_branch }}
MOZ_BUILD_DATE: ${{needs.buildid.outputs.buildids}}

mac:
name: macOS build
uses: ./.github/workflows/macos-release-build.yml
permissions:
contents: write
secrets: inherit
needs: [build-data]
needs: [build-data, buildid]
with:
build-version: ${{ needs.build-data.outputs.version }}
release-branch: ${{ inputs.update_branch }}
MOZ_BUILD_DATE: ${{needs.buildid.outputs.buildids}}

mac-uni:
name: macOS build (Universal)
uses: ./.github/workflows/macos-universal-release-build.yml
permissions:
contents: write
secrets: inherit
needs: [build-data, mac]
with:
build-version: ${{ needs.build-data.outputs.version }}
release-branch: ${{ inputs.update_branch }}
Expand Down Expand Up @@ -453,7 +480,7 @@ jobs:
if: ${{ inputs.create_release || inputs.update_branch == 'twilight' }}
permissions: write-all
name: Release
needs: [build-data, linux, windows-step-3, check-release, mac, appimage, source, lint, stop-self-hosted]
needs: [build-data, linux, windows-step-3, check-release, mac-uni, appimage, source, lint, stop-self-hosted]
runs-on: ubuntu-latest
environment:
name: ${{ inputs.update_branch == 'release' && 'Deploy-Release' || 'Deploy-Twilight' }}
Expand Down
7 changes: 7 additions & 0 deletions .github/workflows/linux-release-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@ on:
description: 'The branch to build'
required: true
type: string
MOZ_BUILD_DATE:
type: string
required: true
default: ""

jobs:
build-linux:
Expand Down Expand Up @@ -130,6 +134,9 @@ jobs:
continue-on-error: true
run: |
export SURFER_PLATFORM="linux"
if [[ -n ${{ inputs.MOZ_BUILD_DATE }} ]];then
export MOZ_BUILD_DATE=${{ inputs.MOZ_BUILD_DATE }}
fi
bash .github/workflows/src/release-build.sh

- name: Package
Expand Down
50 changes: 12 additions & 38 deletions .github/workflows/macos-release-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@ on:
description: 'The branch to build'
required: true
type: string
MOZ_BUILD_DATE:
type: string
required: true
default: ""

jobs:
mac-build:
Expand Down Expand Up @@ -118,61 +122,31 @@ jobs:
ZEN_RELEASE_BRANCH: ${{ inputs.release-branch }}
run: |
export SURFER_PLATFORM="darwin"
if [[ -n ${{ inputs.MOZ_BUILD_DATE }} ]];then
export MOZ_BUILD_DATE=${{ inputs.MOZ_BUILD_DATE }}
fi
bash .github/workflows/src/release-build.sh

- name: Import APPLE DEVELOPER ID CERTIFICATE for .app
uses: Apple-Actions/import-codesign-certs@v3
with:
p12-file-base64: ${{ secrets.macOS_CERTIFICATES_P12_For_App_BASE64 }}
p12-password: ${{ secrets.macOS_CERTIFICATES_P12_PASSWORD }}

- name: Import provisioning profile for .app
run: |
echo "${{ secrets.macOS_PROVISIONING_PROFILE }}" | base64 --decode > ./engine/Zen_Browser.provisionprofile
ls -la

- name: Package
env:
SURFER_COMPAT: ${{ matrix.arch }}
ZEN_GA_DISABLE_PGO: true
MACOS_APPLE_ACCOUNT_ID: ${{ secrets.macOS_AppleAccountId }}
MACOS_APPLE_DEVELOPER_ID_TEAM_ID: ${{ secrets.macOS_AppleDeveloperIdTeamId }}
MACOS_APPLE_DEVELOPER_ID_PASSWORD: ${{ secrets.macOS_AppleDeveloperIdPassword }}
run: |
export SURFER_PLATFORM="darwin"
export MACOS_APPLE_DEVELOPER_ID="${{ secrets.macOS_AppleDeveloperId }}"
export ZEN_RELEASE=1
pnpm package

- name: Rename artifacts
run: |
mv ./dist/output.mar macos-${{ matrix.arch }}.mar
tar -czf zen-${{ matrix.arch }}-apple-darwin-dist.tar.gz ./engine/obj-${{ matrix.arch }}-apple-darwin/dist/

- name: Remove sensitive information
run: |
rm -f ./engine/Zen_Browser.provisionprofile

- name: Sign .dmg
run: |
set -ex
hdiutil convert ./dist/*.dmg -format UDZO -imagekey zlib-level=9 -o zen.macos-${{ matrix.arch }}.dmg
xattr -cr zen.macos-${{ matrix.arch }}.dmg
codesign -s "${{ secrets.macOS_AppleDeveloperId }}" zen.macos-${{ matrix.arch }}.dmg
xcrun notarytool submit "zen.macos-${{ matrix.arch }}.dmg" \
--apple-id "${{ secrets.macOS_AppleAccountId }}" \
--team-id "${{ secrets.macOS_AppleDeveloperIdTeamId }}" \
--password "${{ secrets.macOS_AppleDeveloperIdPassword }}" \
--no-s3-acceleration \
--verbose \
--wait
xcrun stapler staple "zen.macos-${{ matrix.arch }}.dmg"

- name: Upload build artifact
- name: Upload dist dmg
uses: actions/upload-artifact@v4
with:
retention-days: 5
name: zen.macos-${{ matrix.arch }}.dmg
path: ./zen.macos-${{ matrix.arch }}.dmg
retention-days: 1
name: zen-${{ matrix.arch }}-apple-darwin-dist.tar.gz
path: ./zen-${{ matrix.arch }}-apple-darwin-dist.tar.gz

- name: Upload build artifact (.mar)
uses: actions/upload-artifact@v4
Expand Down
Loading
Loading