Skip to content

Commit e349d27

Browse files
authored
Merge pull request #10 from lambdalisue/modernize
Modernize
2 parents 0f09c7b + f5672d1 commit e349d27

File tree

12 files changed

+34
-83
lines changed

12 files changed

+34
-83
lines changed

.github/workflows/test.yml

Lines changed: 13 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
name: Test
22

3+
env:
4+
DENO_VERSION: 1.x
5+
36
on:
47
schedule:
58
- cron: "0 7 * * 0"
@@ -10,46 +13,28 @@ on:
1013

1114
jobs:
1215
check:
13-
strategy:
14-
matrix:
15-
runner:
16-
- ubuntu-latest
17-
version:
18-
- "1.x"
19-
- "1.28.x"
20-
runs-on: ${{ matrix.runner }}
16+
runs-on: ubuntu-latest
2117
steps:
2218
- uses: actions/checkout@v3
2319
- uses: denoland/setup-deno@v1
2420
with:
25-
deno-version: "${{ matrix.version }}"
26-
- name: Lint check
27-
run: |
28-
make lint
29-
- name: Format check
21+
deno-version: ${{ env.DENO_VERSION }}
22+
- name: Format
3023
run: |
31-
make fmt-check
24+
deno fmt --check
25+
- name: Lint
26+
run: deno lint
3227
- name: Type check
33-
run: |
34-
make type-check
28+
run: deno task check
3529

3630
test:
37-
strategy:
38-
matrix:
39-
runner:
40-
- windows-latest
41-
- macos-latest
42-
- ubuntu-latest
43-
version:
44-
- "1.x"
45-
- "1.28.x"
46-
runs-on: ${{ matrix.runner }}
31+
runs-on: ubuntu-latest
4732
steps:
4833
- uses: actions/checkout@v3
4934
- uses: denoland/setup-deno@v1
5035
with:
51-
deno-version: "${{ matrix.version }}"
36+
deno-version: ${{ env.DENO_VERSION }}
5237
- name: Test
5338
run: |
54-
make test
39+
deno task test
5540
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 & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
/.tools
2-
/.deno
1+
deno.lock

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright 2021 Alisue, hashnote.net
1+
Copyright 2021 Alisue <[email protected]>
22

33
Permission is hereby granted, free of charge, to any person obtaining a copy
44
of this software and associated documentation files (the "Software"), to deal

Makefile

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

builtins.test.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
import { assertThrows, describe, expect, it } from "./deps_test.ts";
1+
import { assertThrows } from "https://deno.land/[email protected]/testing/asserts.ts";
2+
import { describe, it } from "https://deno.land/[email protected]/testing/bdd.ts";
3+
import { expect } from "https://deno.land/x/[email protected]/mod.ts";
24
import {
35
all,
46
any,

custom.test.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
import { describe, expect, it } from "./deps_test.ts";
1+
import { describe, it } from "https://deno.land/[email protected]/testing/bdd.ts";
2+
import { expect } from "https://deno.land/x/[email protected]/mod.ts";
23
import { compact, compactObject, flatmap } from "./custom.ts";
34
import { repeat } from "./itertools.ts";
45

deno.jsonc

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

deps_test.ts

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

itertools.test.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
import { describe, expect, it } from "./deps_test.ts";
1+
import { describe, it } from "https://deno.land/[email protected]/testing/bdd.ts";
2+
import { expect } from "https://deno.land/x/[email protected]/mod.ts";
23
import { all, iter, range } from "./builtins.ts";
34
import {
45
chain,

0 commit comments

Comments
 (0)