Skip to content

Commit

Permalink
Merge pull request #157 from bindable-ui/workflow-upgrade
Browse files Browse the repository at this point in the history
updating workflow ubuntu version
  • Loading branch information
harlio authored May 2, 2023
2 parents 3d6a62c + 7ade314 commit 53b0e3f
Show file tree
Hide file tree
Showing 11 changed files with 864 additions and 1,279 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@ on:

jobs:
coverage:
runs-on: ubuntu-latest
runs-on: ubuntu-20.04

steps:
- uses: actions/checkout@master
- name: Checks Test Coverage
uses: actions/setup-node@v1
with:
node-version: '12.x'
node-version: '14.18.0'
- run: npm install -g jest
- run: npm install -g yarn
- run: yarn
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ on:

jobs:
publish:
runs-on: ubuntu-latest
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@master
- uses: actions/setup-node@v1
with:
node-version: 12
node-version: '14.18.0'
registry-url: https://registry.npmjs.org/
- run: npm install -g yarn
- run: yarn
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@ on:

jobs:
tests:
runs-on: ubuntu-latest
runs-on: ubuntu-20.04

steps:
- uses: actions/checkout@master
- name: Runs Tests
uses: actions/setup-node@v1
with:
node-version: '12.x'
node-version: '14.18.0'
- run: npm install -g jest
- run: npm install -g yarn
- run: yarn
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
12
14.18.0
2 changes: 1 addition & 1 deletion dev-app/app.html
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
<c-nav-horizontal-item
position="right"
href="https://github.com/bindable-ui/bindable"
title="v1.11.12"
title="v1.12.0"
></c-nav-horizontal-item>
</c-nav-horizontal>
</l-box>
Expand Down
1 change: 1 addition & 0 deletions jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ module.exports = {
'^.+\\.ts$': 'ts-jest'
},
testRegex: '\\.test\\.ts$',
testRunner: 'jest-jasmine2',
testTimeout: 60000,
setupFiles: [
'<rootDir>/test/jest-pretest.ts',
Expand Down
19 changes: 10 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@
"license": "MIT",
"devDependencies": {
"@bindable-ui/bindable-icons": "^0.3.2",
"@types/jest": "^24.9.1",
"@types/jest": "^29.5.1",
"@types/jquery": "^3.5.14",
"@types/lodash": "^4.14.181",
"@types/node": "^10.17.60",
"@types/lodash": "^4.14.194",
"@types/node": "^18.16.3",
"async": "^3.2.3",
"aurelia-animator-css": "^1.0.4",
"aurelia-bootstrapper": "^2.3.2",
Expand All @@ -36,11 +36,12 @@
"gulp-postcss": "^8.0.0",
"gulp-rename": "^1.4.0",
"gulp-tslint": "^8.1.4",
"gulp-typescript": "^5.0.0",
"gulp-typescript": "5.0.1",
"gulp-watch": "^5.0.1",
"husky": "^2.4.1",
"jest": "^26.6.3",
"jest-cli": "^26.6.3",
"jest": "^29.5.0",
"jest-cli": "^29.5.0",
"jest-jasmine2": "^29.5.0",
"jest-localstorage-mock": "^2.4.21",
"jest-transform-stub": "^2.0.0",
"js-beautify": "^1.14.3",
Expand All @@ -57,13 +58,13 @@
"requirejs": "^2.3.6",
"text": "github:requirejs/text#latest",
"through2": "^3.0.2",
"ts-jest": "^26.5.6",
"ts-jest": "^29.1.0",
"ts-mockito": "^2.6.1",
"ts-polyfill": "^3.8.2",
"tslint": "^5.20.1",
"tslint-config-airbnb": "^5.11.1",
"tslint-eslint-rules": "^5.4.0",
"typescript": "^3.9.10",
"typescript": "^5.0.4",
"vinyl-fs": "^3.0.3"
},
"peerDependencies": {
Expand Down Expand Up @@ -105,7 +106,7 @@
"update-version": "node ./update-version.js"
},
"engines": {
"node": ">=12.22.12"
"node": ">=14.18.0"
},
"main": "dist/commonjs/index.js",
"module": "dist/native-modules/index.js",
Expand Down
12 changes: 6 additions & 6 deletions src/components/timeline/c-timeline/c-timeline.ts
Original file line number Diff line number Diff line change
Expand Up @@ -953,8 +953,8 @@ export class CTimeline {
return [_.last(zoomLevelData.allowedHours), _.last(zoomLevelData.allowedMinutes)];
}

let hour = 0;
let minute = 0;
let hour: number = 0;
let minute: number = 0;

switch (timeClone.length) {
case 4:
Expand All @@ -973,8 +973,8 @@ export class CTimeline {
}

if (zoomLevelData.allowedMinutes.indexOf(minute) === -1) {
if (minute > _.last(zoomLevelData.allowedMinutes)) {
minute = _.last(zoomLevelData.allowedMinutes);
if (minute > _.toNumber(_.last(zoomLevelData.allowedMinutes))) {
minute = _.toNumber(_.last(zoomLevelData.allowedMinutes));
} else {
for (let a = 0; a < zoomLevelData.allowedMinutes.length - 1; a += 1) {
if (minute > zoomLevelData.allowedMinutes[a] && minute < zoomLevelData.allowedMinutes[a + 1]) {
Expand All @@ -990,8 +990,8 @@ export class CTimeline {
}

if (zoomLevelData.allowedHours.indexOf(hour) === -1) {
if (hour > _.last(zoomLevelData.allowedHours)) {
hour = _.last(zoomLevelData.allowedHours);
if (hour > _.toNumber(_.last(zoomLevelData.allowedHours))) {
hour = _.toNumber(_.last(zoomLevelData.allowedHours));
} else {
for (let a = 0; a < zoomLevelData.allowedHours.length - 1; a += 1) {
if (hour > zoomLevelData.allowedHours[a] && hour < zoomLevelData.allowedHours[a + 1]) {
Expand Down
1 change: 1 addition & 0 deletions src/components/toasts/c-toasts/c-toasts-service.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ describe('Audience List route', () => {

beforeEach(() => {
jest.useFakeTimers();
jest.spyOn(global, 'setTimeout');
component = new CToastsService();
});

Expand Down
2 changes: 1 addition & 1 deletion src/helpers/copy-to-clipboard.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ export function copyToClipboard(textToCopy, notification) {
}
*/

return new Promise<any>((resolve, reject) => {
return new Promise<void>((resolve, reject) => {
if (window.clipboardData && window.clipboardData.setData) {
// IE specific code path to prevent textarea being shown while dialog is visible.
const rval = window.clipboardData.setData('Text', textToCopy);
Expand Down
Loading

0 comments on commit 53b0e3f

Please sign in to comment.