Skip to content
This repository has been archived by the owner on Jul 22, 2024. It is now read-only.

Commit

Permalink
Bug 1574661 - update to use new TC deployment (#2086)
Browse files Browse the repository at this point in the history
* Bug 1574661 - update to use new TC deployment

* Use new worker pool names (provisionerId / workerType)
* Use new secret names

* update links in README
  • Loading branch information
djmitche authored and bluemarvin committed Nov 4, 2019
1 parent c5abf5f commit 8f26d45
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 18 deletions.
28 changes: 14 additions & 14 deletions .taskcluster.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ tasks:
###############################################################################
- $if: 'tasks_for == "github-pull-request" && event["action"] in ["opened", "edited", "reopened", "synchronize"]'
then:
provisionerId: 'aws-provisioner-v1'
workerType: 'github-worker'
provisionerId: 'proj-firefoxreality'
workerType: 'ci-linux'
deadline: {$fromNow: 1 day}
expires: {$fromNow: 1 year}
payload:
Expand Down Expand Up @@ -64,14 +64,14 @@ tasks:
then: "-f ${event.ref[19:]}"
else: "-f master"
in:
provisionerId: 'aws-provisioner-v1'
workerType: 'github-worker'
provisionerId: 'proj-firefoxreality'
workerType: 'ci-linux'
deadline: {$fromNow: 1 day}
expires: {$fromNow: 1 year}
scopes:
- "secrets:get:project/firefoxreality/github-deploy-key"
- "secrets:get:project/firefoxreality/staging-signing-token"
- "secrets:get:project/firefoxreality/symbols-token"
- "secrets:get:project/firefoxreality/fr/github-deploy-key"
- "secrets:get:project/firefoxreality/fr/staging-signing-token"
- "secrets:get:project/firefoxreality/fr/symbols-token"
routes:
- [email protected]
payload:
Expand All @@ -92,7 +92,7 @@ tasks:
&& . tools/taskcluster/get_third_party.sh
&& cp tools/gradle/taskcluster.properties ./user.properties
&& ./gradlew --no-daemon --console=plain clean `python tools/taskcluster/build_targets.py =all`
&& python tools/taskcluster/fetch_secret.py -s project/firefoxreality/staging-signing-token -o token -n token
&& python tools/taskcluster/fetch_secret.py -s project/firefoxreality/fr/staging-signing-token -o token -n token
&& python tools/taskcluster/sign_apk.py -t token ${featureName}
&& python tools/taskcluster/archive_debug_apk.py
&& . tools/taskcluster/upload_symbols.sh
Expand All @@ -114,14 +114,14 @@ tasks:
###############################################################################
- $if: 'tasks_for == "github-release" && event["action"] == "published"'
then:
provisionerId: 'aws-provisioner-v1'
workerType: 'github-worker'
provisionerId: 'proj-firefoxreality'
workerType: 'ci-linux'
deadline: {$fromNow: 1 day}
expires: {$fromNow: 1 year}
scopes:
- "secrets:get:project/firefoxreality/github-deploy-key"
- "secrets:get:project/firefoxreality/release-signing-token"
- "secrets:get:project/firefoxreality/symbols-token"
- "secrets:get:project/firefoxreality/fr/github-deploy-key"
- "secrets:get:project/firefoxreality/fr/release-signing-token"
- "secrets:get:project/firefoxreality/fr/symbols-token"
routes:
- [email protected]
payload:
Expand All @@ -142,7 +142,7 @@ tasks:
&& . tools/taskcluster/get_third_party.sh
&& cp tools/gradle/taskcluster.properties ./user.properties
&& ./gradlew --no-daemon --console=plain clean `python tools/taskcluster/build_targets.py ${event.release.tag_name}`
&& python tools/taskcluster/fetch_secret.py -s project/firefoxreality/release-signing-token -o token -n token
&& python tools/taskcluster/fetch_secret.py -s project/firefoxreality/fr/release-signing-token -o token -n token
&& python tools/taskcluster/sign_apk.py -t token -r
&& python tools/taskcluster/archive_debug_apk.py
&& . tools/taskcluster/upload_symbols.sh
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@ The goal of the Firefox Reality project is to create a full-featured browser exc

You can find us on Twitter [@MozillaReality](https://twitter.com/mozillareality) and at [[email protected]](mailto:[email protected]).

[![Task Status](https://github.taskcluster.net/v1/repository/MozillaReality/FirefoxReality/master/badge.svg)](https://github.taskcluster.net/v1/repository/MozillaReality/FirefoxReality/master/latest) [Build results](https://github.taskcluster.net/v1/repository/MozillaReality/FirefoxReality/master/latest)
[![Task Status](https://community-tc.services.mozilla.com/api/github/v1/repository/MozillaReality/FirefoxReality/master/badge.svg)](https://community-tc.services.mozilla.com/api/github/v1/repository/MozillaReality/FirefoxReality/master/latest) [Build results](https://community-tc.services.mozilla.com/api/github/v1/repository/MozillaReality/FirefoxReality/master/latest)

## Download developer APKs

**[Download](https://github.taskcluster.net/v1/repository/MozillaReality/FirefoxReality/master/latest)** [bleeding-edge](https://github.com/MozillaReality/FirefoxReality/commits/master) developer APKs for Firefox Reality.
**[Download](https://community-tc.services.mozilla.com/api/github/v1/repository/MozillaReality/FirefoxReality/master/latest)** [bleeding-edge](https://github.com/MozillaReality/FirefoxReality/commits/master) developer APKs for Firefox Reality.

### Advanced

1. Load [this TaskCluster URL](https://github.taskcluster.net/v1/repository/MozillaReality/FirefoxReality/master/latest).
1. Load [this TaskCluster URL](https://community-tc.services.mozilla.com/api/github/v1/repository/MozillaReality/FirefoxReality/master/latest).
2. Click the `Firefox Reality for Android - Build - Master update →` link.
3. Click the `Run Artifacts` tab, and click to download the APK for your platform of choice.

Expand Down
2 changes: 1 addition & 1 deletion tools/taskcluster/get_third_party.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
mkdir ~/.ssh
chmod go-rwx ~/.ssh
cp tools/ssh/config ~/.ssh
python tools/taskcluster/fetch_secret.py -s project/firefoxreality/github-deploy-key -o ~/.ssh/deploymentkey_rsa -n key
python tools/taskcluster/fetch_secret.py -s project/firefoxreality/fr/github-deploy-key -o ~/.ssh/deploymentkey_rsa -n key
chmod go-rwx ~/.ssh/deploymentkey_rsa
git clone [email protected]:MozillaReality/FirefoxReality-android-third-party.git third_party
pushd third_party && git checkout -b target-branch `cat ../third_party_hash` && popd

0 comments on commit 8f26d45

Please sign in to comment.