Skip to content

Commit d14c5ec

Browse files
authored
Update jbrowse npm packages (#127)
* Update jbrowse npm packages * Attempt to make publish step conditional for PRs
1 parent f1c492e commit d14c5ec

File tree

4 files changed

+20280
-199
lines changed

4 files changed

+20280
-199
lines changed

.github/workflows/build.yml

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,11 @@ jobs:
2424

2525
- name: "Print default branch"
2626
run: |
27-
echo 'Default branch: ${{ fromJson(steps.get_default_branch.outputs.data).default_branch }}'
28-
echo "##[set-output name=branch;]$(echo '${{ fromJson(steps.get_default_branch.outputs.data).default_branch }}')"
27+
DEFAULT_BRANCH='${{ fromJson(steps.get_default_branch.outputs.data).default_branch }}'
28+
echo 'Default branch: '$DEFAULT_BRANCH
29+
echo "DEFAULT_BRANCH=${DEFAULT_BRANCH}" >> $GITHUB_ENV
2930
id: default-branch
3031

31-
- name: Extract branch name
32-
shell: bash
33-
run: echo "##[set-output name=branch;]$(echo ${GITHUB_REF#refs/heads/})"
34-
id: extract-branch
35-
3632
- name: "Build DISCVR"
3733
uses: bimberlabinternal/DevOps/githubActions/discvr-build@master
3834
with:
@@ -42,14 +38,14 @@ jobs:
4238
github_token: ${{ secrets.PAT }}
4339
env:
4440
# Only generate the distribution if this is the default branch
45-
GENERATE_DIST: ${{ steps.default-branch.branch == steps.extract-branch.branch && '1' || '0' }}
41+
GENERATE_DIST: ${{ env.DEFAULT_BRANCH == github.ref_name && '1' || '0' }}
4642

4743
- name: Publish Release
48-
if: github.ref == '/refs/heads/${{ fromJson(steps.get_default_branch.outputs.data).default_branch }}' && github.event_name == 'push' && github.base_ref == ''
44+
if: ${{ env.DEFAULT_BRANCH == github.ref_name && github.event_name == 'push' && github.base_ref == '' }}
4945
uses: "marvinpinto/action-automatic-releases@latest"
5046
with:
5147
repo_token: "${{ secrets.PAT }}"
5248
automatic_release_tag: "latest"
5349
prerelease: true
54-
title: "Development Build: ${{ fromJson(steps.get_default_branch.outputs.data).default_branch }}"
50+
title: "Development Build: ${{ env.DEFAULT_BRANCH }}"
5551
files: /home/runner/work/_temp/_github_home/lkDist/discvr/DISCVR-*

.github/workflows/build_latest.yml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,14 @@ jobs:
1919
GITHUB_TOKEN: ${{ secrets.PAT }}
2020

2121
- name: "Print default branch"
22-
run: "echo 'Default branch: ${{ fromJson(steps.get_default_branch.outputs.data).default_branch }}'"
22+
run: |
23+
DEFAULT_BRANCH='${{ fromJson(steps.get_default_branch.outputs.data).default_branch }}'
24+
echo 'Default branch: '$DEFAULT_BRANCH
25+
echo "DEFAULT_BRANCH=${DEFAULT_BRANCH}" >> $GITHUB_ENV
26+
id: default-branch
2327

2428
- name: "Build DISCVR"
25-
if: github.ref == '/refs/heads/${{ fromJson(steps.get_default_branch.outputs.data).default_branch }}'
29+
if: ${{ env.DEFAULT_BRANCH == github.ref_name }}
2630
uses: bimberlabinternal/DevOps/githubActions/discvr-build@master
2731
with:
2832
artifactory_user: ${{secrets.artifactory_user}}
@@ -34,7 +38,7 @@ jobs:
3438

3539
# See: https://github.com/marketplace/actions/automatic-releases
3640
- name: Deploy Build
37-
if: github.ref == '/refs/heads/${{ fromJson(steps.get_default_branch.outputs.data).default_branch }}'
41+
if: ${{ env.DEFAULT_BRANCH == github.ref_name }}
3842
uses: "marvinpinto/action-automatic-releases@latest"
3943
with:
4044
repo_token: "${{ secrets.PAT }}"

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ name: Publish Release
22
on:
33
release:
44
types: [created]
5+
tags-ignore: [latest]
56
jobs:
67
generate:
78
name: Create release-artifacts
@@ -22,7 +23,6 @@ jobs:
2223
GENERATE_DIST: 1
2324

2425
- name: Upload Artifacts
25-
if: github.event_name == 'release' && github.event.action == 'created'
2626
uses: skx/github-action-publish-binaries@master
2727
env:
2828
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

0 commit comments

Comments
 (0)