From 4b8c6a713d82a2b7af104fe30b031c1afa31a821 Mon Sep 17 00:00:00 2001 From: Colin Date: Mon, 15 Nov 2021 21:14:01 -0500 Subject: [PATCH] Master->main --- .github/workflows/push.yml | 4 ++-- .../stories/GettingStarted.stories.mdx | 2 +- .../stories/JBrowseCircularGenomeView.stories.tsx | 9 +++------ .../stories/GettingStarted.stories.mdx | 2 +- 4 files changed, 7 insertions(+), 10 deletions(-) diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index feaba74155..9498861d66 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -83,7 +83,7 @@ jobs: cd products/jbrowse-web/build && zip -r "jbrowse-web-$(echo ${{github.ref}} | cut -d '/' -f3-).zip" . && cd - aws s3 sync --delete products/jbrowse-web/build s3://jbrowse.org/code/jb2/$(echo ${{github.ref}} | cut -d "/" -f3-) storybook_lgv: - name: Build and deploy static Storybook site to AWS S3 + name: Build and deploy static linear genome view Storybook site to AWS S3 runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 @@ -109,7 +109,7 @@ jobs: aws s3 sync --delete storybook-static s3://jbrowse.org/storybook/lgv/$(echo ${{github.ref}} | cut -d "/" -f3-) working-directory: products/jbrowse-react-linear-genome-view storybook_cgv: - name: Build and deploy static Storybook site to AWS S3 + name: Build and deploy static circular genome view Storybook site to AWS S3 runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 diff --git a/products/jbrowse-react-circular-genome-view/stories/GettingStarted.stories.mdx b/products/jbrowse-react-circular-genome-view/stories/GettingStarted.stories.mdx index f6ee5a3cff..73a3a2d2cf 100644 --- a/products/jbrowse-react-circular-genome-view/stories/GettingStarted.stories.mdx +++ b/products/jbrowse-react-circular-genome-view/stories/GettingStarted.stories.mdx @@ -74,4 +74,4 @@ with the component. Here are a few more resources that may help: - [Code example](https://github.com/GMOD/jbrowse-components/blob/HEAD/products/jbrowse-react-circular-genome-view/docs/example.md) -- [Story source code](https://github.com/GMOD/jbrowse-components/tree/master/products/jbrowse-react-circular-genome-view/stories) +- [Story source code](https://github.com/GMOD/jbrowse-components/tree/main/products/jbrowse-react-circular-genome-view/stories) diff --git a/products/jbrowse-react-circular-genome-view/stories/JBrowseCircularGenomeView.stories.tsx b/products/jbrowse-react-circular-genome-view/stories/JBrowseCircularGenomeView.stories.tsx index 71d7550535..609a57f3f5 100644 --- a/products/jbrowse-react-circular-genome-view/stories/JBrowseCircularGenomeView.stories.tsx +++ b/products/jbrowse-react-circular-genome-view/stories/JBrowseCircularGenomeView.stories.tsx @@ -128,8 +128,7 @@ const hg19Assembly = { adapter: { type: 'RefNameAliasAdapter', location: { - uri: - 'https://s3.amazonaws.com/jbrowse.org/genomes/hg19/hg19_aliases.txt', + uri: 'https://s3.amazonaws.com/jbrowse.org/genomes/hg19/hg19_aliases.txt', locationType: 'UriLocation', }, }, @@ -146,14 +145,12 @@ const hg19Tracks = [ adapter: { type: 'VcfTabixAdapter', vcfGzLocation: { - uri: - 'https://s3.amazonaws.com/jbrowse.org/genomes/hg19/pacbio/hs37d5.HG002-SequelII-CCS.bnd-only.sv.vcf.gz', + uri: 'https://s3.amazonaws.com/jbrowse.org/genomes/hg19/pacbio/hs37d5.HG002-SequelII-CCS.bnd-only.sv.vcf.gz', locationType: 'UriLocation', }, index: { location: { - uri: - 'https://s3.amazonaws.com/jbrowse.org/genomes/hg19/pacbio/hs37d5.HG002-SequelII-CCS.bnd-only.sv.vcf.gz.tbi', + uri: 'https://s3.amazonaws.com/jbrowse.org/genomes/hg19/pacbio/hs37d5.HG002-SequelII-CCS.bnd-only.sv.vcf.gz.tbi', locationType: 'UriLocation', }, }, diff --git a/products/jbrowse-react-linear-genome-view/stories/GettingStarted.stories.mdx b/products/jbrowse-react-linear-genome-view/stories/GettingStarted.stories.mdx index 706b6d9303..13900fa6ee 100644 --- a/products/jbrowse-react-linear-genome-view/stories/GettingStarted.stories.mdx +++ b/products/jbrowse-react-linear-genome-view/stories/GettingStarted.stories.mdx @@ -93,4 +93,4 @@ Here are a few more resources that may help: - [The guide for creating default sessions](/?path=/story/default-sessions--page) - [Code example](https://github.com/GMOD/jbrowse-components/blob/HEAD/products/jbrowse-react-linear-genome-view/docs/example.md) -- [Story source code](https://github.com/GMOD/jbrowse-components/tree/master/products/jbrowse-react-linear-genome-view/stories) +- [Story source code](https://github.com/GMOD/jbrowse-components/tree/main/products/jbrowse-react-linear-genome-view/stories)