mirror of
https://github.com/servo/servo.git
synced 2025-08-04 13:10:20 +01:00
Auto merge of #23415 - servo:jdm-patch-48, r=SimonSapin
Make net.generic.worker a LaunchDaemon Based on my reading in https://www.launchd.info/ I don't believe it should be a LaunchAgent, since it runs for another user than the one that is logged in. <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/23415) <!-- Reviewable:end -->
This commit is contained in:
commit
32ddc420a4
2 changed files with 15 additions and 5 deletions
|
@ -228,7 +228,7 @@ def macos_unit():
|
||||||
macos_build_task("Dev build + unit tests")
|
macos_build_task("Dev build + unit tests")
|
||||||
.with_treeherder("macOS x64", "Unit")
|
.with_treeherder("macOS x64", "Unit")
|
||||||
.with_script("""
|
.with_script("""
|
||||||
./mach build --dev
|
./mach build --dev --verbose
|
||||||
./mach test-unit
|
./mach test-unit
|
||||||
./mach package --dev
|
./mach package --dev
|
||||||
./etc/ci/lockfile_changed.sh
|
./etc/ci/lockfile_changed.sh
|
||||||
|
@ -264,7 +264,7 @@ def android_arm32_dev_from_macos():
|
||||||
export HOST_CC="$(brew --prefix llvm)/bin/clang"
|
export HOST_CC="$(brew --prefix llvm)/bin/clang"
|
||||||
export HOST_CXX="$(brew --prefix llvm)/bin/clang++"
|
export HOST_CXX="$(brew --prefix llvm)/bin/clang++"
|
||||||
./mach bootstrap-android --accept-all-licences --build
|
./mach bootstrap-android --accept-all-licences --build
|
||||||
./mach build --android --dev
|
./mach build --android --dev --verbose
|
||||||
""")
|
""")
|
||||||
.find_or_create("android_arm32_dev.macos." + CONFIG.git_sha)
|
.find_or_create("android_arm32_dev.macos." + CONFIG.git_sha)
|
||||||
)
|
)
|
||||||
|
@ -509,7 +509,7 @@ def macos_wpt():
|
||||||
macos_build_task("Release build")
|
macos_build_task("Release build")
|
||||||
.with_treeherder("macOS x64", "Release")
|
.with_treeherder("macOS x64", "Release")
|
||||||
.with_script("""
|
.with_script("""
|
||||||
./mach build --release
|
./mach build --release --verbose
|
||||||
./etc/ci/lockfile_changed.sh
|
./etc/ci/lockfile_changed.sh
|
||||||
tar -czf target.tar.gz \
|
tar -czf target.tar.gz \
|
||||||
target/release/servo \
|
target/release/servo \
|
||||||
|
|
|
@ -13,6 +13,8 @@ GMT:
|
||||||
- source_hash: sha256=817e72972a7c077f1a829d5824e5c0e831eb6f9b254672e7427246a8dd476a59
|
- source_hash: sha256=817e72972a7c077f1a829d5824e5c0e831eb6f9b254672e7427246a8dd476a59
|
||||||
- mode: 755
|
- mode: 755
|
||||||
- makedirs: True
|
- makedirs: True
|
||||||
|
- watch_in:
|
||||||
|
- service: net.generic.worker
|
||||||
|
|
||||||
{{ bin }}/livelog:
|
{{ bin }}/livelog:
|
||||||
file.managed:
|
file.managed:
|
||||||
|
@ -20,6 +22,8 @@ GMT:
|
||||||
- source_hash: sha256=be5d4b998b208afd802ac6ce6c4d4bbf0fb3816bb039a300626abbc999dfe163
|
- source_hash: sha256=be5d4b998b208afd802ac6ce6c4d4bbf0fb3816bb039a300626abbc999dfe163
|
||||||
- mode: 755
|
- mode: 755
|
||||||
- makedirs: True
|
- makedirs: True
|
||||||
|
- watch_in:
|
||||||
|
- service: net.generic.worker
|
||||||
|
|
||||||
{{ bin }}/taskcluster-proxy:
|
{{ bin }}/taskcluster-proxy:
|
||||||
file.managed:
|
file.managed:
|
||||||
|
@ -27,6 +31,8 @@ GMT:
|
||||||
- source_hash: sha256=3faf524b9c6b9611339510797bf1013d4274e9f03e7c4bd47e9ab5ec8813d3ae
|
- source_hash: sha256=3faf524b9c6b9611339510797bf1013d4274e9f03e7c4bd47e9ab5ec8813d3ae
|
||||||
- mode: 755
|
- mode: 755
|
||||||
- makedirs: True
|
- makedirs: True
|
||||||
|
- watch_in:
|
||||||
|
- service: net.generic.worker
|
||||||
|
|
||||||
{{ user }} group:
|
{{ user }} group:
|
||||||
group.present:
|
group.present:
|
||||||
|
@ -74,7 +80,11 @@ GMT:
|
||||||
- runas: {{ user }}
|
- runas: {{ user }}
|
||||||
|
|
||||||
/Library/LaunchAgents/net.generic.worker.plist:
|
/Library/LaunchAgents/net.generic.worker.plist:
|
||||||
|
file.absent: []
|
||||||
|
|
||||||
|
net.generic.worker:
|
||||||
file.managed:
|
file.managed:
|
||||||
|
- name: /Library/LaunchDaemons/net.generic.worker.plist
|
||||||
- mode: 600
|
- mode: 600
|
||||||
- user: root
|
- user: root
|
||||||
- template: jinja
|
- template: jinja
|
||||||
|
@ -84,7 +94,7 @@ GMT:
|
||||||
etc: {{ etc }}
|
etc: {{ etc }}
|
||||||
home: {{ home }}
|
home: {{ home }}
|
||||||
username: {{ user }}
|
username: {{ user }}
|
||||||
|
|
||||||
net.generic.worker:
|
|
||||||
service.running:
|
service.running:
|
||||||
- enable: True
|
- enable: True
|
||||||
|
- watch:
|
||||||
|
- file: /Library/LaunchDaemons/net.generic.worker.plist
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue