Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
Daniel Perrett committed Jul 19, 2022
2 parents 208050a + a1d32c2 commit ea50857
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 6 deletions.
10 changes: 8 additions & 2 deletions .github/workflows/update-gh-pages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,7 @@ jobs:
with:
node-version: ${{ matrix.node-version }}
- run: yarn install
- run: yarn build --env public-path=/Genoverse/dist/
- name: Commit and push files
- name: Update gh-pages
run: |
echo $GITHUB_ACTOR
git config --local user.email "$GITHUB_ACTOR@users.noreply.github.com"
Expand All @@ -28,6 +27,13 @@ jobs:
git checkout gh-pages
git pull
git reset --hard origin/master
rm -rf dist
- run: yarn build --env public-path=/Genoverse/dist/
- name: Commit and push files
run: |
echo $GITHUB_ACTOR
git config --local user.email "$GITHUB_ACTOR@users.noreply.github.com"
git config --local user.name $GITHUB_ACTOR
git add -f dist
git commit -m "Added dist folder"
git push --force origin gh-pages
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "genoverse",
"version": "4.0.4",
"version": "4.0.5",
"description": "Genoverse is a portable, customizable, back-end independent JavaScript and HTML5 based genome browser which allows the user to explore data in a dynamic and interactive manner.",
"main": "src/js/Genoverse.js",
"directories": {
Expand Down
6 changes: 3 additions & 3 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -4205,9 +4205,9 @@ jest@^27.5.1:
jest-cli "^27.5.1"

jquery-ui@^1.13.0:
version "1.13.1"
resolved "https://registry.yarnpkg.com/jquery-ui/-/jquery-ui-1.13.1.tgz#d0b7a42e73a04c31bb5706adf86f6f8942f64eaa"
integrity sha512-2VlU59N5P4HaumDK1Z3XEVjSvegFbEOQRgpHUBaB2Ak98Axl3hFhJ6RFcNQNuk9SfL6WxIbuLst8dW/U56NSiA==
version "1.13.2"
resolved "https://registry.yarnpkg.com/jquery-ui/-/jquery-ui-1.13.2.tgz#de03580ae6604773602f8d786ad1abfb75232034"
integrity sha512-wBZPnqWs5GaYJmo1Jj0k/mrSkzdQzKDwhXNtHKcBdAcKVxMM3KNYFq+iJ2i1rwiG53Z8M4mTn3Qxrm17uH1D4Q==
dependencies:
jquery ">=1.8.0 <4.0.0"

Expand Down

0 comments on commit ea50857

Please sign in to comment.