For #22556 - Update to latest taskgraph revision + path changes

upstream-sync
Heitor Neiva 3 years ago committed by mergify[bot]
parent 1bcf37ba7c
commit 01f88caa49

@ -8,7 +8,7 @@ tasks:
- $let:
taskgraph:
branch: taskgraph
revision: 9daff451cfbe82c5c70237a7b3dbcf4fd3238299
revision: d85f4e4213706ec7737c7257f681977fdf20eb60
trustDomain: mobile
in:
$let:
@ -248,9 +248,9 @@ tasks:
command:
- /usr/local/bin/run-task
- '--mobile-checkout=/builds/worker/checkouts/src'
- '--mobile-checkout=/builds/worker/checkouts/vcs'
- '--taskgraph-checkout=/builds/worker/checkouts/taskgraph'
- '--task-cwd=/builds/worker/checkouts/src'
- '--task-cwd=/builds/worker/checkouts/vcs'
- '--'
- bash
- -cx
@ -292,7 +292,7 @@ tasks:
expires: {$fromNow: '1 year'}
'public/docker-contexts':
type: 'directory'
path: '/builds/worker/checkouts/src/docker-contexts'
path: '/builds/worker/checkouts/vcs/docker-contexts'
# This needs to be at least the deadline of the
# decision task + the docker-image task deadlines.
# It is set to a week to allow for some time for

@ -22,7 +22,7 @@ job-defaults:
type: file
name: public/build/{abi}/target.apk
github-name: 'fenix-{version}-{abi}.apk'
path: '/builds/worker/checkouts/src/app/build/outputs/apk/{gradle_build_type}/{fileName}'
path: '/builds/worker/checkouts/vcs/app/build/outputs/apk/{gradle_build_type}/{fileName}'
description: Build Fenix from source code.
fetches:
toolchain:
@ -81,7 +81,7 @@ jobs:
gradle-build-type: androidTest
apk-artifact-template:
# 2 differences here: "androidTest/" is added and "{gradle_build_type}" is forced to "debug"
path: '/builds/worker/checkouts/src/app/build/outputs/apk/androidTest/debug/{fileName}'
path: '/builds/worker/checkouts/vcs/app/build/outputs/apk/androidTest/debug/{fileName}'
treeherder:
symbol: debug(Bat)
@ -99,7 +99,7 @@ jobs:
# 2 differences here:
# * "androidTest/" is added
# * "{gradle_build_type}" is forced to "debug"
path: '/builds/worker/checkouts/src/app/build/outputs/apk/androidTest/nightly/app-nightly-androidTest.apk'
path: '/builds/worker/checkouts/vcs/app/build/outputs/apk/androidTest/nightly/app-nightly-androidTest.apk'
disable-optimization: true
run:
gradle-build-type: androidTest
@ -114,7 +114,7 @@ jobs:
# * "androidTest/" is added
# * "{gradle_build_type}" is forced to "beta"
# * "{fileName}" is forced to "app-beta-androidTest.apk"
path: '/builds/worker/checkouts/src/app/build/outputs/apk/androidTest/beta/app-beta-androidTest.apk'
path: '/builds/worker/checkouts/vcs/app/build/outputs/apk/androidTest/beta/app-beta-androidTest.apk'
disable-optimization: true
run:
gradle-build-type: androidTest
@ -129,7 +129,7 @@ jobs:
# * "androidTest/" is added
# * "{gradle_build_type}" is forced to "beta"
# * "{fileName}" is forced to "app-beta-androidTest.apk"
path: '/builds/worker/checkouts/src/app/build/outputs/apk/androidTest/beta/app-beta-androidTest.apk'
path: '/builds/worker/checkouts/vcs/app/build/outputs/apk/androidTest/beta/app-beta-androidTest.apk'
disable-optimization: true
run:
gradle-build-type: androidTest

@ -53,7 +53,7 @@ jobs:
worker:
artifacts:
- name: public/reports
path: /builds/worker/checkouts/src/build/reports
path: /builds/worker/checkouts/vcs/build/reports
type: directory
- name: public/github
path: /builds/worker/github
@ -75,7 +75,7 @@ jobs:
worker:
artifacts:
- name: public/reports
path: /builds/worker/checkouts/src/app/build/reports
path: /builds/worker/checkouts/vcs/app/build/reports
type: directory
- name: public/github
path: /builds/worker/github

@ -52,10 +52,10 @@ jobs:
worker:
artifacts:
- name: public/reports/index.html
path: /builds/worker/checkouts/src/app/build/reports/tests/testDebugUnitTest/index.html
path: /builds/worker/checkouts/vcs/app/build/reports/tests/testDebugUnitTest/index.html
type: file
- name: public/reports/test
path: /builds/worker/checkouts/src/app/build/reports/tests
path: /builds/worker/checkouts/vcs/app/build/reports/tests
type: directory
- name: public/github
path: /builds/worker/github

@ -18,7 +18,7 @@ echo "running as" $(id)
set -v
mkdir -p ${NEXUS_WORK}/conf
cp /builds/worker/checkouts/src/taskcluster/scripts/toolchain/android-gradle-dependencies/nexus.xml ${NEXUS_WORK}/conf/nexus.xml
cp /builds/worker/checkouts/vcs/taskcluster/scripts/toolchain/android-gradle-dependencies/nexus.xml ${NEXUS_WORK}/conf/nexus.xml
PATH="/usr/lib/jvm/java-8-openjdk-amd64/jre/bin/:$PATH" RUN_AS_USER=worker /opt/sonatype/nexus/bin/nexus restart

Loading…
Cancel
Save