Skip to content

Commit 0d6c803

Browse files
authored
run comparison tests in consistent location on Windows (#1277)
* run comparison tests in consistent location * update status badge * delete old examples * Update README.md
1 parent a1b19a1 commit 0d6c803

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+50
-18195
lines changed

.github/workflows/push.yml

Lines changed: 47 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
name: Continuous Integration (build and test)
1+
name: build and test
22

33
on: [push, pull_request]
44

55
jobs:
6-
comparison_test:
7-
name: Ubuntu Comparison Tests
6+
comparison_test_ubuntu:
7+
name: Comparison Tests Ubuntu
88
runs-on: ubuntu-latest
99
timeout-minutes: 25
1010
steps:
@@ -16,14 +16,11 @@ jobs:
1616
- name: build
1717
run: yarn build
1818

19-
- name: install typescript
20-
run: yarn add [email protected]
21-
2219
- name: test
2320
run: sudo yarn comparison-tests
2421

25-
windows:
26-
name: Windows Comparison Tests
22+
comparison_test_windows:
23+
name: Comparison Tests Windows
2724
runs-on: windows-latest
2825
timeout-minutes: 25
2926
steps:
@@ -43,22 +40,17 @@ jobs:
4340
run: yarn build
4441
working-directory: C:\source\ts-loader
4542

46-
- name: install typescript
47-
run: yarn add [email protected]
48-
working-directory: C:\source\ts-loader
49-
5043
- name: test
5144
run: yarn comparison-tests
5245
working-directory: C:\source\ts-loader
5346

54-
execution_test:
55-
name: Execution Tests
47+
execution_test_ubuntu:
48+
name: Execution Tests Ubuntu
5649
strategy:
5750
matrix:
58-
os: [ubuntu, windows]
59-
node: [10, 12, 14]
60-
ts: [3.8.3, 3.9.3, 4.0.3, 4.1.2, next]
61-
runs-on: ${{ matrix.os }}-latest
51+
node: [12, 14]
52+
ts: [3.8.3, 3.9.3, 4.0.3, 4.1.5, next]
53+
runs-on: ubuntu-latest
6254
steps:
6355
- uses: actions/checkout@v2
6456

@@ -79,6 +71,43 @@ jobs:
7971
- name: test
8072
run: yarn execution-tests
8173

74+
execution_test_windows:
75+
name: Execution Tests Windows
76+
strategy:
77+
matrix:
78+
node: [12, 14]
79+
ts: [3.8.3, 3.9.3, 4.0.3, 4.1.5, next]
80+
runs-on: windows-latest
81+
steps:
82+
- uses: actions/checkout@v2
83+
84+
- name: install node
85+
uses: actions/setup-node@v1
86+
with:
87+
node-version: ${{ matrix.node }}
88+
89+
- name: copy files
90+
shell: pwsh
91+
run: |
92+
New-Item C:\source\ts-loader -ItemType Directory
93+
Copy-Item .\* C:\source\ts-loader -Recurse -Force
94+
95+
- name: install
96+
run: yarn install
97+
working-directory: C:\source\ts-loader
98+
99+
- name: build
100+
run: yarn build
101+
working-directory: C:\source\ts-loader
102+
103+
- name: install typescript
104+
run: yarn add typescript@${{ matrix.ts }}
105+
working-directory: C:\source\ts-loader
106+
107+
- name: test
108+
run: yarn execution-tests
109+
working-directory: C:\source\ts-loader
110+
82111
lint:
83112
name: Lint
84113
runs-on: ubuntu-latest

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ on:
22
release:
33
types: [published]
44

5-
name: Release (build, test and publish)
5+
name: release
66

77
jobs:
88
build_test_and_publish:

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# TypeScript loader for webpack
22

33
[![npm version](https://img.shields.io/npm/v/ts-loader.svg)](https://www.npmjs.com/package/ts-loader)
4-
![GitHub build)](https://github.com/TypeStrong/ts-loader/workflows/Continuous%20Integration%20(build%20and%20test)/badge.svg)
4+
[![build and test](https://github.com/TypeStrong/ts-loader/actions/workflows/push.yml/badge.svg)](https://github.com/TypeStrong/ts-loader/actions/workflows/push.yml)
55
[![Downloads](http://img.shields.io/npm/dm/ts-loader.svg)](https://npmjs.org/package/ts-loader)
66
[![node version](https://img.shields.io/node/v/ts-loader.svg)](https://www.npmjs.com/package/ts-loader)
77
[![code style: prettier](https://img.shields.io/badge/code_style-prettier-ff69b4.svg)](https://github.com/prettier/prettier)
@@ -127,7 +127,7 @@ If you'd like to see a simple setup take a look at [our simple example](examples
127127

128128
### Babel
129129

130-
`ts-loader` works very well in combination with [babel](https://babeljs.io/) and [babel-loader](https://github.com/babel/babel-loader). There is an [example](https://github.com/Microsoft/TypeScriptSamples/tree/master/react-flux-babel-karma) of this in the official [TypeScript Samples](https://github.com/Microsoft/TypeScriptSamples). Alternatively take a look at our own [example](examples/react-babel-karma-gulp).
130+
`ts-loader` works very well in combination with [babel](https://babeljs.io/) and [babel-loader](https://github.com/babel/babel-loader). There is an [example](https://github.com/Microsoft/TypeScriptSamples/tree/master/react-flux-babel-karma) of this in the official [TypeScript Samples](https://github.com/Microsoft/TypeScriptSamples).
131131

132132
### Parallelising Builds
133133

examples/react-babel-karma-gulp/README.md

Lines changed: 0 additions & 15 deletions
This file was deleted.

examples/react-babel-karma-gulp/gulp/clean.js

Lines changed: 0 additions & 29 deletions
This file was deleted.

examples/react-babel-karma-gulp/gulp/inject.js

Lines changed: 0 additions & 55 deletions
This file was deleted.

examples/react-babel-karma-gulp/gulp/staticFiles.js

Lines changed: 0 additions & 31 deletions
This file was deleted.

examples/react-babel-karma-gulp/gulp/tests.js

Lines changed: 0 additions & 45 deletions
This file was deleted.

examples/react-babel-karma-gulp/gulp/webpack.js

Lines changed: 0 additions & 39 deletions
This file was deleted.

examples/react-babel-karma-gulp/gulpFile.js

Lines changed: 0 additions & 44 deletions
This file was deleted.

0 commit comments

Comments
 (0)