Skip to content

Commit f326a4d

Browse files
gurjit03yadvirkaurJapnitSsaintsoldierx
authored
hotfix: Travis yml (#1756)
* fix hyphen issue for sync and controller code * minnor change for sync and controller code * chore: removes visraam class * Adds isMahaanKoshTooltipEnabled boolean to the render logic of Larivaar & standard display * Adds a setting to enable Mahaan Kosh Tooltip under the settings tab, needs work on the svg icon * Adds reading mode to getBaaniLine to fix the mahaankosh reading mode bug * Fixes MahaanKoshTooltipBug by wrapping BaaniLine with MahaanKoshContext.provider * Updates test case * chore: fixes display print option * chore: fixes horizontal scroll * Updates Meta.test.jsx snapshot to fix failed build * Fixes MahaanKoshTooltip Toggle icon * Fixes MahaanKoshTooltipSetting Icon * Fix api urls constants (#1749) * chore: adds production url back to the api constants * chore: updates package.json * updates banner page text (#1750) * chore: updates main page banner text * fix: fixes typo and links * chore: updates texts * chore: updates to v1.17.9 (#1751) * chore: updates packge-lock.json (#1754) * chore: updates travis yml (#1755) * chore: updates travis yml * chore: updates to beta v5 * Release v1.17.9 (#1752) (#1753) * fix hyphen issue for sync and controller code * minnor change for sync and controller code * chore: removes visraam class * Adds isMahaanKoshTooltipEnabled boolean to the render logic of Larivaar & standard display * Adds a setting to enable Mahaan Kosh Tooltip under the settings tab, needs work on the svg icon * Adds reading mode to getBaaniLine to fix the mahaankosh reading mode bug * Fixes MahaanKoshTooltipBug by wrapping BaaniLine with MahaanKoshContext.provider * Updates test case * chore: fixes display print option * chore: fixes horizontal scroll * Updates Meta.test.jsx snapshot to fix failed build * Fixes MahaanKoshTooltip Toggle icon * Fixes MahaanKoshTooltipSetting Icon * Fix api urls constants (#1749) * chore: adds production url back to the api constants * chore: updates package.json * updates banner page text (#1750) * chore: updates main page banner text * fix: fixes typo and links * chore: updates texts * chore: updates to v1.17.9 (#1751) --------- Co-authored-by: Yadvir Kaur <yadvirkaur15@gmail.com> Co-authored-by: Japnit Singh <singj36@mcmaster.ca> Co-authored-by: Aman Singh <saintsoldierx@gmail.com> Co-authored-by: Japnit Singh <57968393+JapnitS@users.noreply.github.com> * Adds rvm install to pre-install step * Removes the hotfix from dev branch * Adds ruby version upgrade step to pre-install step (#1758) * Adds rvm install to pre-install step * Removes the hotfix from dev branch * Specifies command to use ruby version, force install dpl 2.0.5.1 * Upgrades ruby version to 3.3.5 * Fixes Ruby version to 3.1.0 * Should fix unrecogonized ruby version by updating rvm * Gem goes to older version * Fixes gem to a previous version * Degrades dpl version to 1.10.16 * Fixes dpl version by adding version under branch directly --------- Co-authored-by: Yadvir Kaur <yadvirkaur15@gmail.com> Co-authored-by: Japnit Singh <singj36@mcmaster.ca> Co-authored-by: Aman Singh <saintsoldierx@gmail.com> Co-authored-by: Japnit Singh <57968393+JapnitS@users.noreply.github.com>
1 parent ec75d3c commit f326a4d

3 files changed

Lines changed: 8 additions & 2 deletions

File tree

.travis.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,22 @@ deploy:
2222
# deploy to dev
2323
- provider: script
2424
script: bash scripts/deploy.sh dev
25+
edge:
26+
branch: v1.10.16
2527
on:
2628
branch: dev
2729
# deploy to production
2830
- provider: script
2931
script: bash scripts/deploy.sh prod
32+
edge:
33+
branch: v1.10.16
3034
on:
3135
branch: master
3236

3337
before_install:
3438
- npm i -g npm@6.14.8
39+
- rvm install 2.7.0
40+
- rvm use 2.7.0 --default
3541
- bash scripts/decrypt.sh
3642
before_script:
3743
- bash scripts/set-up.sh

package-lock.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,4 +167,4 @@
167167
"singleQuote": true,
168168
"trailingComma": "es5"
169169
}
170-
}
170+
}

0 commit comments

Comments
 (0)