Skip to content

Commit

Permalink
Merge branch 'main' into alpha
Browse files Browse the repository at this point in the history
# Conflicts:
#	package.json
#	yarn.lock
  • Loading branch information
djcsdy committed Jul 7, 2021
2 parents ab9c19d + 17a1882 commit a7ec92b
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 15 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
name: CI
on: [push, pull_request]
on: [ push, pull_request ]
env:
CI: true
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
NPM_TOKEN: ${{secrets.NPM_TOKEN}}
DEPLOY_NODE_VERSION: 14.x
DEPLOY_NODE_VERSION: 16.x
jobs:
build-and-test:
name: Build and Test
runs-on: ubuntu-latest
strategy:
matrix:
node-version: [10.x, 12.x, 14.x]
node-version: [ 10.x, 12.x, 14.x, 16.x ]
steps:
- name: Find yarn cache
id: find-yarn-cache
Expand Down
2 changes: 1 addition & 1 deletion LICENSE.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright 2018-2020 Software Ventures Limited.
Copyright 2018-2021 Software Ventures Limited.

Permission to use, copy, modify, and/or distribute this software for any
purpose with or without fee is hereby granted, provided that the above
Expand Down
22 changes: 11 additions & 11 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,27 @@
"name": "@softwareventures/table",
"version": "0.1.2-development",
"description": "Types and functions for processing unstructured tabular data",
"repository": "github:softwareventures/table",
"keywords": [
"tables",
"TypeScript"
"TypeScript",
"tables"
],
"author": "Daniel Cassidy <[email protected]>",
"license": "ISC",
"homepage": "https://github.com/softwareventures/table",
"bugs": {
"url": "https://github.com/softwareventures/table/issues"
},
"homepage": "https://github.com/softwareventures/table",
"repository": "github:softwareventures/table",
"license": "ISC",
"scripts": {
"prepare": "tslint --project . && tsc",
"test": "echo No tests yet",
"semantic-release": "semantic-release"
"semantic-release": "semantic-release",
"test": "echo No tests yet"
},
"sideEffects": false,
"dependencies": {
"dictionary-types": "^1.0.0",
"tslib": "^1.9.3 || ^2.0.0 || ^2.1.0"
},
"devDependencies": {
"@softwareventures/semantic-release-config": "1.2.0",
"@softwareventures/tsconfig": "5.1.0",
Expand All @@ -28,10 +32,6 @@
"tslint": "6.1.3",
"typescript": "4.3.5"
},
"dependencies": {
"dictionary-types": "^1.0.0",
"tslib": "^1.9.3 || ^2.0.0 || ^2.1.0"
},
"config": {
"commitizen": {
"path": "./node_modules/cz-conventional-changelog"
Expand Down

0 comments on commit a7ec92b

Please sign in to comment.