Skip to content

Commit 0f09c7b

Browse files
authored
Merge pull request #8 from lambdalisue/up
📦 Upgrade dependencies, etc.
2 parents 7bbd3c6 + 35c3b4a commit 0f09c7b

File tree

5 files changed

+48
-57
lines changed

5 files changed

+48
-57
lines changed

.github/workflows/test.yml

Lines changed: 34 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,59 +1,55 @@
11
name: Test
22

3-
env:
4-
DENO_VERSION: 1.x
5-
63
on:
74
schedule:
85
- cron: "0 7 * * 0"
96
push:
107
branches:
118
- main
129
pull_request:
13-
branches:
14-
- main
1510

1611
jobs:
17-
lint:
18-
runs-on: ubuntu-latest
12+
check:
13+
strategy:
14+
matrix:
15+
runner:
16+
- ubuntu-latest
17+
version:
18+
- "1.x"
19+
- "1.28.x"
20+
runs-on: ${{ matrix.runner }}
1921
steps:
20-
- uses: actions/checkout@v2
21-
- uses: denoland/setup-deno@main
22+
- uses: actions/checkout@v3
23+
- uses: denoland/setup-deno@v1
2224
with:
23-
deno-version: ${{ env.DENO_VERSION }}
24-
- name: Lint
25-
run: deno lint
26-
27-
format:
28-
runs-on: ubuntu-latest
29-
steps:
30-
- uses: actions/checkout@v2
31-
- uses: denoland/setup-deno@main
32-
with:
33-
deno-version: ${{ env.DENO_VERSION }}
34-
- name: Format
25+
deno-version: "${{ matrix.version }}"
26+
- name: Lint check
27+
run: |
28+
make lint
29+
- name: Format check
3530
run: |
36-
deno fmt --check
31+
make fmt-check
32+
- name: Type check
33+
run: |
34+
make type-check
3735
3836
test:
39-
runs-on: ubuntu-latest
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 }}
4047
steps:
41-
- uses: actions/checkout@v2
42-
- uses: denoland/setup-deno@main
48+
- uses: actions/checkout@v3
49+
- uses: denoland/setup-deno@v1
4350
with:
44-
deno-version: ${{ env.DENO_VERSION }}
51+
deno-version: "${{ matrix.version }}"
4552
- name: Test
4653
run: |
47-
deno test
54+
make test
4855
timeout-minutes: 5
49-
50-
typecheck:
51-
runs-on: ubuntu-latest
52-
steps:
53-
- uses: actions/checkout@v2
54-
- uses: denoland/setup-deno@main
55-
with:
56-
deno-version: ${{ env.DENO_VERSION }}
57-
- name: Type check
58-
run: |
59-
deno test --unstable --no-run ./*.ts

.github/workflows/udd.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,13 @@ jobs:
99
udd:
1010
runs-on: ubuntu-latest
1111
steps:
12-
- uses: actions/checkout@v2
12+
- uses: actions/checkout@v3
1313
- uses: denoland/setup-deno@v1
1414
with:
1515
deno-version: "1.x"
1616
- name: Update dependencies
1717
run: |
18-
make tools
19-
make update > ../output.txt
18+
make deps > ../output.txt
2019
env:
2120
NO_COLOR: 1
2221
- name: Read ../output.txt
@@ -36,7 +35,7 @@ jobs:
3635
${{ steps.log.outputs.content }}
3736
3837
EOM
39-
- uses: peter-evans/create-pull-request@v3
38+
- uses: peter-evans/create-pull-request@v4
4039
with:
4140
title: ":package: Update Deno dependencies"
4241
body: |

Makefile

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
TOOLS := ${CURDIR}/.tools
1+
TARGETS := $$(find . -name '*.ts' -or -name '*.md')
22

33
.DEFAULT_GOAL := help
44

@@ -7,27 +7,23 @@ help:
77
perl -ne 'print if /^\w+.*##/;' | \
88
perl -pe 's/(.*):.*##\s*/sprintf("%-20s",$$1)/eg;'
99

10-
tools: FORCE ## Install development tools
11-
@mkdir -p ${TOOLS}
12-
@deno install -A -f -n udd --root ${TOOLS} https://deno.land/x/[email protected]/main.ts
13-
1410
fmt: FORCE ## Format code
15-
@deno fmt --ignore=.deno
11+
@deno fmt
1612

1713
fmt-check: FORCE ## Format check
18-
@deno fmt --check --ignore=.deno
14+
@deno fmt --check
1915

2016
lint: FORCE ## Lint code
21-
@deno lint --ignore=.deno
17+
@deno lint
2218

2319
type-check: FORCE ## Type check
24-
@deno test --unstable --no-run $$(find . -name '*.ts' -not -name '.deno')
20+
@deno test --no-run ${TARGETS}
2521

2622
test: FORCE ## Test
27-
@deno test --no-check --unstable -A --jobs
23+
@deno test -A --no-check
2824

29-
update: FORCE ## Update dependencies
30-
@${TOOLS}/bin/udd $$(find . -name '*.ts' -not -name '.deno')
25+
deps: FORCE ## Update dependencies
26+
@deno run -A https://deno.land/x/[email protected]/main.ts ${TARGETS}
3127
@make fmt
3228

3329
FORCE:

builtins.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@ describe("range", () => {
260260
() => {
261261
range(0, 1, 0);
262262
},
263-
undefined,
263+
Error,
264264
"range() arg 3 must not be zero",
265265
);
266266
});

deps_test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
export { expect } from "https://deno.land/x/[email protected].9/mod.ts";
2-
export * from "https://deno.land/std@0.110.0/testing/asserts.ts";
1+
export { expect } from "https://deno.land/x/[email protected].10/mod.ts";
2+
export * from "https://deno.land/std@0.164.0/testing/asserts.ts";
33

44
const currentScopes: string[] = [];
55

0 commit comments

Comments
 (0)