Skip to content

Commit 904f18e

Browse files
authored
Merge pull request #18 from lambdalisue/modernize
Modernize
2 parents 6c2900b + 0d82521 commit 904f18e

File tree

13 files changed

+35
-99
lines changed

13 files changed

+35
-99
lines changed

.github/workflows/npm.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ env:
77
on:
88
push:
99
tags:
10-
- 'v*'
10+
- "v*"
1111

1212
jobs:
1313
publish:
@@ -22,9 +22,9 @@ jobs:
2222
- uses: actions/setup-node@v3
2323
with:
2424
node-version: ${{ env.NODE_VERSION }}
25-
registry-url: 'https://registry.npmjs.org'
25+
registry-url: "https://registry.npmjs.org"
2626
- name: Build
27-
run: make build-npm
27+
run: deno task build-npm
2828
- name: Publish
2929
run: |
3030
cd npm

.github/workflows/test.yml

Lines changed: 13 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,57 +1,40 @@
11
name: Test
22

3+
env:
4+
DENO_VERSION: 1.x
5+
36
on:
47
schedule:
58
- cron: "0 7 * * 0"
69
push:
710
branches:
811
- main
912
pull_request:
10-
branches:
11-
- main
1213

1314
jobs:
1415
check:
15-
strategy:
16-
matrix:
17-
runner:
18-
- ubuntu-latest
19-
version:
20-
- "1.x"
21-
- "1.28.x"
22-
runs-on: ${{ matrix.runner }}
16+
runs-on: ubuntu-latest
2317
steps:
2418
- uses: actions/checkout@v3
2519
- uses: denoland/setup-deno@v1
2620
with:
27-
deno-version: "${{ matrix.version }}"
28-
- name: Lint check
21+
deno-version: ${{ env.DENO_VERSION }}
22+
- name: Format
2923
run: |
30-
make lint
31-
- name: Format check
32-
run: |
33-
make fmt-check
24+
deno fmt --check
25+
- name: Lint
26+
run: deno lint
3427
- name: Type check
35-
run: |
36-
make type-check
28+
run: deno task check
3729

3830
test:
39-
strategy:
40-
matrix:
41-
runner:
42-
- windows-latest
43-
- macos-latest
44-
- ubuntu-latest
45-
version:
46-
- "1.x"
47-
- "1.28.x"
48-
runs-on: ${{ matrix.runner }}
31+
runs-on: ubuntu-latest
4932
steps:
5033
- uses: actions/checkout@v3
5134
- uses: denoland/setup-deno@v1
5235
with:
53-
deno-version: "${{ matrix.version }}"
36+
deno-version: ${{ env.DENO_VERSION }}
5437
- name: Test
5538
run: |
56-
make test
39+
deno task test
5740
timeout-minutes: 5

.github/workflows/udd.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
deno-version: "1.x"
1616
- name: Update dependencies
1717
run: |
18-
make deps > ../output.txt
18+
deno task upgrade > ../output.txt
1919
env:
2020
NO_COLOR: 1
2121
- name: Read ../output.txt

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
/npm
2+
deno.lock

Makefile

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

README.md

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -235,32 +235,6 @@ More complex type predications are available on `maybeXXXXX` as well like
235235
3. Rename `ensureXXXXX` to `assertXXXXX` (e.g. `ensureString` to `assertString`)
236236
4. Rename `assumeXXXXX` to `ensureXXXXX` (e.g. `assumeNumber` to `ensureNumber`)
237237

238-
## Development
239-
240-
Lint code like:
241-
242-
```text
243-
make lint
244-
```
245-
246-
Format code like
247-
248-
```text
249-
make fmt
250-
```
251-
252-
Check types like
253-
254-
```text
255-
make type-check
256-
```
257-
258-
Run tests like:
259-
260-
```text
261-
make test
262-
```
263-
264238
## License
265239

266240
The code follows MIT license written in [LICENSE](./LICENSE). Contributors need

assert_test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { assertThrows } from "./deps_test.ts";
1+
import { assertThrows } from "https://deno.land/[email protected]/testing/asserts.ts";
22
import {
33
assertArray,
44
assertBoolean,

deno.jsonc

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"lock": false,
3+
"tasks": {
4+
"build-npm": "deno run -A scripts/build_npm.ts $(git describe --tags --always --dirty)",
5+
"test": "deno test --unstable -A --parallel",
6+
"check": "deno check --unstable $(find . -name '*.ts')",
7+
"upgrade": "deno run -A https://deno.land/x/udd/main.ts $(find . -name '*.ts' -not -path '*/npm/*')"
8+
}
9+
}

deps_test.ts

Lines changed: 0 additions & 1 deletion
This file was deleted.

ensure_test.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1-
import { assertEquals, assertThrows } from "./deps_test.ts";
1+
import {
2+
assertEquals,
3+
assertThrows,
4+
} from "https://deno.land/[email protected]/testing/asserts.ts";
25
import {
36
ensureArray,
47
ensureBoolean,

0 commit comments

Comments
 (0)