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.

Sign up for GitHub

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

Fix unresolvable deps in deploy-benchmarks build #8972

Merged
merged 3 commits into from
Nov 13, 2019
Merged

Fix unresolvable deps in deploy-benchmarks build #8972

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b935080
Import styleBenchmarkLocations directly from gazetteer
Nov 13, 2019
a34c81c
[DNM] Enable deploy-benchmarks build on this branch, skipping S3 uploads
Nov 13, 2019
caf028f
Revert "[DNM] Enable deploy-benchmarks build on this branch, skipping…
Nov 13, 2019
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
15 changes: 8 additions & 7 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ workflows:
only:
- master
- /release-.*/
- fix-deploy-benchmarks
- deploy-release:
requires:
- lint
Expand Down Expand Up @@ -233,13 +234,13 @@ jobs:
- run:
name: Build
command: BENCHMARK_VERSION="${CIRCLE_TAG:-$CIRCLE_BRANCH} $(git rev-parse --short=7 HEAD)" yarn run build-benchmarks
- aws-cli/install
- run:
name: Upload benchmark
command: aws s3 cp --acl public-read --content-type application/javascript bench/versions/benchmarks_generated.js s3://mapbox-gl-js/${CIRCLE_TAG:-$CIRCLE_BRANCH}/benchmarks.js
- run:
name: Upload source maps
command: aws s3 cp --acl public-read --content-type application/javascript bench/versions/benchmarks_generated.js.map s3://mapbox-gl-js/${CIRCLE_TAG:-$CIRCLE_BRANCH}/benchmarks.js.map
# - aws-cli/install
# - run:
# name: Upload benchmark
# command: aws s3 cp --acl public-read --content-type application/javascript bench/versions/benchmarks_generated.js s3://mapbox-gl-js/${CIRCLE_TAG:-$CIRCLE_BRANCH}/benchmarks.js
# - run:
# name: Upload source maps
# command: aws s3 cp --acl public-read --content-type application/javascript bench/versions/benchmarks_generated.js.map s3://mapbox-gl-js/${CIRCLE_TAG:-$CIRCLE_BRANCH}/benchmarks.js.map

deploy-release:
<<: *defaults
Expand Down
4 changes: 2 additions & 2 deletions bench/styles/benchmarks.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import mapboxgl from '../../src';
import accessToken from '../lib/access_token';
import locationsWithTileID from '../lib/locations_with_tile_id';
import {benchmark} from '@mapbox/gazetteer';
import styleBenchmarkLocations from '@mapbox/gazetteer/benchmark/style-benchmark-locations.json';
import StyleLayerCreate from '../benchmarks/style_layer_create';
import Validate from '../benchmarks/style_validate';
import Layout from '../benchmarks/layout';
Expand All @@ -11,7 +11,7 @@ import QueryBox from '../benchmarks/query_box';

import getWorkerPool from '../../src/util/global_worker_pool';

const locations = locationsWithTileID(benchmark.styleBenchmarkLocations.features);
const locations = locationsWithTileID(styleBenchmarkLocations.features);

mapboxgl.accessToken = accessToken;

Expand Down
4 changes: 2 additions & 2 deletions bench/versions/benchmarks.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import mapboxgl from '../../src';
import accessToken from '../lib/access_token';
import locationsWithTileID from '../lib/locations_with_tile_id';
import {benchmark} from '@mapbox/gazetteer';
import styleBenchmarkLocations from '@mapbox/gazetteer/benchmark/style-benchmark-locations.json';
import Layout from '../benchmarks/layout';
import LayoutDDS from '../benchmarks/layout_dds';
import SymbolLayout from '../benchmarks/symbol_layout';
Expand All @@ -21,7 +21,7 @@ import FilterEvaluate from '../benchmarks/filter_evaluate';

import getWorkerPool from '../../src/util/global_worker_pool';

const styleLocations = locationsWithTileID(benchmark.styleBenchmarkLocations.features);
const styleLocations = locationsWithTileID(styleBenchmarkLocations.features);

mapboxgl.accessToken = accessToken;

Expand Down