Skip to content

Commit 6f45d57

Browse files
committed
Include dictionary on export; fix yml syntax for workflow
1 parent e093852 commit 6f45d57

File tree

2 files changed

+17
-2
lines changed

2 files changed

+17
-2
lines changed

.github/workflows/sync-repos.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55
jobs:
66
sync-release-branches:
77
# github.head_ref should only be set on forked repos, meaning this action should only run on the primary fork
8-
if: !github.head_ref
8+
if: github.head_ref == ''
99
runs-on: ubuntu-latest
1010
steps:
1111
- name: "Sync Release Branches"
@@ -17,7 +17,7 @@ jobs:
1717
destination_branch_prefix: "discvr-"
1818
github_token: ${{ secrets.GITHUB_TOKEN }}
1919
sync-develop:
20-
if: !github.head_ref
20+
if: github.head_ref == ''
2121
runs-on: ubuntu-latest
2222
steps:
2323
- name: "Sync Develop Branch"

SequenceAnalysis/src/org/labkey/sequenceanalysis/SequenceAnalysisController.java

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3659,6 +3659,21 @@ else if (fastaFileType.isType(data.getFile()))
36593659
}
36603660
}
36613661
}
3662+
3663+
File dict = new File(data.getFile().getParentFile(), FileUtil.getBaseName(data.getFile()) + ".dict");
3664+
if (dict.exists())
3665+
{
3666+
files.add(dict);
3667+
}
3668+
else
3669+
{
3670+
//Try alternate name scheme
3671+
dict = new File(data.getFile() + ".dict");
3672+
if (dict.exists())
3673+
{
3674+
files.add(dict);
3675+
}
3676+
}
36623677
}
36633678
}
36643679

0 commit comments

Comments
 (0)