Skip to content
This repository has been archived by the owner on Nov 6, 2024. It is now read-only.

Commit

Permalink
Merge pull request #292 from Esri/b/fix-broken-deps-and-ci
Browse files Browse the repository at this point in the history
B/fix broken deps and ci
  • Loading branch information
tomwayson authored Mar 31, 2022
2 parents be5df96 + 30f5717 commit 9aaf301
Show file tree
Hide file tree
Showing 6 changed files with 1,637 additions and 1,168 deletions.
40 changes: 20 additions & 20 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
# This is a basic workflow to help you get started with Actions
# install dependencies, run build and tests

name: CI
name: Node.js CI

# Controls when the workflow will run
on:
# Triggers the workflow on push or pull request events but only for the master branch
push:
branches: [ master ]
pull_request:
Expand All @@ -13,24 +11,26 @@ on:
# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:

# A workflow run is made up of one or more jobs that can run sequentially or in parallel
jobs:
# This workflow contains a single job called "build"
build:
# The type of runner that the job will run on

runs-on: ubuntu-latest

# Steps represent a sequence of tasks that will be executed as part of the job
steps:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- uses: actions/checkout@v3
strategy:
matrix:
node-version: [14.x, 16.x]
# See supported Node.js release schedule at https://nodejs.org/en/about/releases/

- uses: borales/[email protected]
with:
cmd: install # will run `yarn install` command
- uses: borales/[email protected]
with:
cmd: build # will run `yarn build` command
- uses: borales/[email protected]
with:
cmd: test # will run `yarn test` command
steps:
- uses: actions/checkout@v3
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node-version }}
cache: 'yarn'
- name: Install dependencies
run: yarn
- name: Install Firefox
uses: browser-actions/setup-firefox@latest
- name: Run tests
run: env FIREFOX_BIN=`which firefox` yarn ci
15 changes: 0 additions & 15 deletions .travis.yml

This file was deleted.

3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ This project adheres to [Semantic Versioning](http://semver.org/).
### Added
### Changed
- fix build by not compiling @types
- update TypeScript and karma-typescript dependencies
- use GitHub Actions instead of travis.yml

### Fixed
### Removed
### Breaking
Expand Down
16 changes: 9 additions & 7 deletions karma.conf.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
// Karma configuration
// Generated on Wed Mar 08 2017 13:05:58 GMT-0800 (PST)

var isTravis = !!process.env.TRAVIS;

module.exports = function(config) {
var configuration = {

Expand Down Expand Up @@ -77,13 +75,17 @@ module.exports = function(config) {
coverageReporter: {
type : 'text',
dir : 'coverage/'
},

customLaunchers: {
'FirefoxHeadless': {
base: 'Firefox',
flags: [
'-headless',
],
}
}
};

// run code coverage locally
if (!isTravis) {
configuration.reporters.push('coverage');
}

config.set(configuration);
};
7 changes: 4 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,15 @@
"bundle": "rollup -c",
"build:release": "npm run build && npm run bundle -- profiles/prod.config.js",
"compile": "tsc",
"ci": "karma start --single-run=true --browsers FirefoxHeadless",
"clean": "rimraf dist && mkdirp dist",
"lint": "tslint -c tslint.json 'src/esri-loader.ts'",
"prebuild:release": "npm run clean",
"precompile": "npm run lint",
"prepublish": "npm run build:release",
"preversion": "npm run test && git add README.md CHANGELOG.md",
"start": "karma start",
"test": "karma start --single-run=true --browsers Firefox"
"test": "karma start --single-run=true --browsers Chrome,Firefox"
},
"repository": {
"type": "git",
Expand Down Expand Up @@ -52,13 +53,13 @@
"karma-firefox-launcher": "^1.1.0",
"karma-jasmine": "^1.1.0",
"karma-mocha-reporter": "^2.2.3",
"karma-typescript": "^4.0.0",
"karma-typescript": "^5.5.3",
"mkdirp": "^0.5.1",
"onchange": "^3.2.1",
"rimraf": "^2.6.2",
"rollup": "^0.41.6",
"rollup-plugin-uglify": "^2.0.1",
"tslint": "^5.7.0",
"typescript": "^3.3.4000"
"typescript": "^4.6.3"
}
}
Loading

0 comments on commit 9aaf301

Please sign in to comment.