Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitc448e99

Browse files
committed
Merge branch 'main' into provisionerdaemon
2 parentsbc27864 +e2da8b9 commitc448e99

23 files changed

+202
-162
lines changed

‎.github/dependabot.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ updates:
3434
prefix:"chore"
3535

3636
-package-ecosystem:"npm"
37-
directory:"/"
37+
directory:"/site/"
3838
schedule:
3939
interval:"daily"
4040
time:"06:00"

‎.github/workflows/coder.yaml‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,11 @@ jobs:
6161

6262
-name:Install node_modules
6363
run:yarn install
64+
working-directory:site
6465

6566
-name:"yarn lint"
6667
run:yarn lint
68+
working-directory:site
6769

6870
gen:
6971
name:"style/gen"
@@ -113,6 +115,7 @@ jobs:
113115

114116
-name:Install node_modules
115117
run:yarn install
118+
working-directory:site
116119

117120
-name:"make ${{ matrix.style }}"
118121
run:"make --output-sync -j ${{ matrix.style }}"
@@ -194,15 +197,18 @@ jobs:
194197
node-version:"14"
195198

196199
-run:yarn install
200+
working-directory:site
197201

198202
-run:yarn build
203+
working-directory:site
199204

200205
-run:yarn test:coverage
206+
working-directory:site
201207

202208
-uses:codecov/codecov-action@v2
203209
if:github.actor != 'dependabot[bot]'
204210
with:
205211
token:${{ secrets.CODECOV_TOKEN }}
206-
files:./coverage/lcov.info
212+
files:./site/coverage/lcov.info
207213
flags:unittest-js
208214
fail_ci_if_error:true

‎.gitignore‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,12 @@ yarn-error.log
1616

1717
# Front-end ignore
1818
.next/
19+
site/.eslintcache
1920
site/.next/
21+
site/node_modules/
22+
site/yarn-error.log
2023
coverage/
2124

2225
# Build
2326
bin/
24-
site/out/
27+
site/out/

‎Makefile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ fmt/prettier:
2626
@echo"--- prettier"
2727
# Avoid writing files in CI to reduce file write activity
2828
ifdefCI
29-
yarn run format:check
29+
cd site &&yarn run format:check
3030
else
31-
yarn run format:write
31+
cd site &&yarn run format:write
3232
endif
3333
.PHONY: fmt/prettier
3434

@@ -74,6 +74,6 @@ provisionersdk/proto: provisionersdk/proto/provisioner.proto
7474
.PHONY: provisionersdk/proto
7575

7676
site/out:
77-
yarn build
78-
yarnexport
77+
cd site&&yarn build
78+
cd site&&yarnexport
7979
.PHONY: site/out

‎coderd/projecthistory_test.go‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ import (
1414
)
1515

1616
funcTestProjectHistory(t*testing.T) {
17+
t.Parallel()
18+
1719
t.Run("NoHistory",func(t*testing.T) {
1820
t.Parallel()
1921
server:=coderdtest.New(t)

‎coderd/workspacehistory_test.go‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ import (
1616
)
1717

1818
funcTestWorkspaceHistory(t*testing.T) {
19+
t.Parallel()
20+
1921
setupProjectAndWorkspace:=func(t*testing.T,client*codersdk.Client,user coderd.CreateInitialUserRequest) (coderd.Project, coderd.Workspace) {
2022
project,err:=client.CreateProject(context.Background(),user.Organization, coderd.CreateProjectRequest{
2123
Name:"banana",

‎go.mod‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ require (
3535
go.uber.org/goleakv1.1.12
3636
golang.org/x/cryptov0.0.0-20220126234351-aa10faf2a1f8
3737
golang.org/x/oauth2v0.0.0-20211104180415-d3ed0bb246c8
38+
golang.org/x/syncv0.0.0-20210220032951-036812b2e83c
3839
golang.org/x/xerrorsv0.0.0-20200804184101-5ec99f83aff1
3940
google.golang.org/protobufv1.27.1
4041
nhooyr.io/websocketv1.8.7
@@ -116,4 +117,5 @@ require (
116117
google.golang.org/grpcv1.44.0// indirect
117118
gopkg.in/yaml.v2v2.4.0// indirect
118119
gopkg.in/yaml.v3v3.0.0-20210107192922-496545a6307b// indirect
120+
nhooyr.io/websocketv1.8.7// indirect
119121
)

‎jest.config.js‎

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

‎.eslintignore‎renamed to ‎site/.eslintignore‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,7 @@
22
# COPY PASTA OF .gitignore
33
###############################################################################
44
node_modules
5-
vendor
5+
vendor
6+
out
7+
coverage
8+
.next

‎.eslintrc.yaml‎renamed to ‎site/.eslintrc.yaml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@ parser: "@typescript-eslint/parser"
1818
parserOptions:
1919
ecmaVersion:2018
2020
project:
21-
-"./tsconfig.json"
22-
-"./site/tsconfig.json"
21+
-"./tsconfig.test.json"
2322
sourceType:module
2423
ecmaFeatures:
2524
jsx:true

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp