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

[BI-686] update file template #59

Merged
merged 3 commits into from
Dec 1, 2020
Merged

[BI-686] update file template #59

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5b260a9
[BI-686] update file template
Nov 30, 2020
14b88bd
[BI-686] fix package.json file error
Nov 30, 2020
2d38890
[BI-686] remove comma from version update script
Dec 1, 2020
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
2 changes: 1 addition & 1 deletion .github/workflows/versioner-develop.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
- name: Update version
run: 'sed -i -E "s/\"version\": \"(v[0-9]*\.[0-9]*\.[0-9]*).*,/\"version\": \"\1+${{ github.run_number }}\",/" package.json'
- name: Update version info
run: 'sed -i -E "s~\"versionInfo\": \".*~\"versionInfo\": \"https://github.com/Breeding-Insight/bi-web/commit/${{ github.sha }}\",~" package.json'
run: 'sed -i -E "s~\"versionInfo\": \".*~\"versionInfo\": \"https://github.com/Breeding-Insight/bi-web/commit/${{ github.sha }}\"~" package.json'
- name: Commit package.json
run: |
git config --local user.email "bidevteam@cornell.edu"
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,5 +74,5 @@
},
"devport": "8080",
"task_path": "./task",
"versionInfo": "https://github.com/Breeding-Insight/bi-web/commit/f61de3a1fcbfe07f36e6b46b2dbbdb5e37672ddd",
"versionInfo": "https://github.com/Breeding-Insight/bi-web/commit/f61de3a1fcbfe07f36e6b46b2dbbdb5e37672ddd"
}
2 changes: 1 addition & 1 deletion src/components/trait/TraitImportTemplateMessageBox.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
<div class="level-item">
<div class="has-text-dark has-text-centered is-size-7">
<!-- temporary link until the backend card is done -->
<a href="https://cornell.box.com/shared/static/80pwrdce27ncvbnao1prelm7vkm43kn8.xls"
<a href="https://cornell.box.com/shared/static/t6147nyeysnlt28p0bxyuhxp2hhrvf40.xls"
class="button is-outlined is-primary">Download the Trait Import Template</a>
<br/>Template version placeholder
</div>
Expand Down