Skip to content

Commit

Permalink
Merge branch 'master' into ts_caching_problem
Browse files Browse the repository at this point in the history
  • Loading branch information
ry committed Aug 18, 2020
2 parents 258059a + 7f85bb3 commit 59f2764
Show file tree
Hide file tree
Showing 1,074 changed files with 251,165 additions and 38,678 deletions.
32 changes: 32 additions & 0 deletions .dprintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
{
"$schema": "https://dprint.dev/schemas/v0.json",
"projectType": "openSource",
"incremental": true,
"lineWidth": 80,
"indentWidth": 2,
"typescript": {
"deno": true
},
"markdown": {
"textWrap": "always"
},
"includes": ["**/*.{ts,tsx,js,jsx,json,md}"],
"excludes": [
".cargo_home",
"cli/dts",
"cli/tests/encoding",
"cli/tsc/*typescript.js",
"gh-pages",
"std/**/testdata",
"std/**/vendor",
"std/node_modules",
"std/hash/_wasm",
"target",
"third_party"
],
"plugins": [
"https://plugins.dprint.dev/typescript-0.29.0.wasm",
"https://plugins.dprint.dev/json-0.7.0.wasm",
"https://plugins.dprint.dev/markdown-0.4.0.wasm"
]
}
2 changes: 2 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,5 @@ cli/tests/error_syntax.js
std/deno.d.ts
std/**/testdata/
std/**/node_modules/
cli/tsc/*typescript.js
cli/dts/*
8 changes: 7 additions & 1 deletion .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,13 @@
* text=auto eol=lf
*.png -text

/cli/tests/encoding/* -text

# Tell git which symlinks point to files, and which ones point to directories.
# This is relevant for Windows only, and requires git >= 2.19.2 to work.
/core/libdeno/* symlink=dir
/cli/tests/symlink_to_subdir symlink=dir

# Tell github these are vendored files.
# Doesn't include them in the language statistics.
/cli/tsc/00_typescript.js linguist-vendored
/cli/dts/* linguist-vendored
1 change: 1 addition & 0 deletions .github/FUNDING.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
github: denoland
26 changes: 18 additions & 8 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
strategy:
matrix:
config:
- os: macOS-latest
- os: macos-10.15
kind: test_release
- os: windows-2019
kind: test_release
Expand All @@ -29,8 +29,11 @@ jobs:
# Always run master branch builds to completion. This allows the cache to
# stay mostly up-to-date in situations where a single job fails due to
# e.g. a flaky test.
# Don't fast-fail on tag build because publishing binaries shouldn't be
# prevented if 'cargo publish' fails (which can be a false negative).
fail-fast:
${{ github.event_name != 'push' || github.ref != 'refs/heads/master' }}
${{ github.event_name == 'pull_request' || (github.ref !=
'refs/heads/master' && !startsWith(github.ref, 'refs/tags/')) }}

env:
CARGO_INCREMENTAL: 0
Expand All @@ -41,7 +44,7 @@ jobs:
run: git config --global core.symlinks true

- name: Clone repository
uses: actions/checkout@v1
uses: actions/checkout@v2
with:
# Use depth > 1, because sometimes we need to rebuild master and if
# other commits have landed it will become impossible to rebuild if
Expand All @@ -58,12 +61,18 @@ jobs:
!startsWith(github.ref, 'refs/tags/std/')
run: |
mkdir -p target/release
tar --exclude=.cargo_home --exclude=".git*" --exclude=target --exclude=deno_typescript/typescript/tests --exclude=third_party/cpplint --exclude=third_party/node_modules --exclude=third_party/python_packages --exclude=third_party/prebuilt -czvf target/release/deno_src.tar.gz -C .. deno
tar --exclude=.cargo_home --exclude=".git*" --exclude=target --exclude=third_party/node_modules --exclude=third_party/python_packages --exclude=third_party/prebuilt -czvf target/release/deno_src.tar.gz -C .. deno
- name: Install rust
uses: hecrj/setup-rust-action@v1
with:
rust-version: "1.43.0"
rust-version: 1.45.2

- name: Install rust targets
run: |
# Necessary for the std/wasi tests
rustup target add wasm32-unknown-unknown
rustup target add wasm32-wasi
- name: Install clippy and rustfmt
if: matrix.config.kind == 'lint'
Expand Down Expand Up @@ -101,7 +110,7 @@ jobs:
run: echo "::set-env name=CARGO_HOME::$(pwd)/.cargo_home"

- name: Cache
uses: denoland/github-actions-cache@stable-prerelease
uses: actions/cache@v2
with:
# Note: crates from the denoland/deno git repo always get rebuilt,
# and their outputs ('deno', 'libdeno.rlib' etc.) are quite big,
Expand Down Expand Up @@ -224,9 +233,10 @@ jobs:
run: |
cd core
cargo publish
cd ../deno_typescript
sleep 30
cd ../op_crates/web
cargo publish
cd ../cli
sleep 30
cd ../../cli
sleep 30
cargo publish
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,9 @@ yarn.lock
# yarn creates this in error.
tools/node_modules/

# compiled wasm files
std/wasi/testdata/snapshot_preview1/

# MacOS generated files
.DS_Store
.DS_Store?
5 changes: 0 additions & 5 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,8 +1,3 @@
[submodule "deno_third_party"]
path = third_party
url = https://github.com/denoland/deno_third_party.git
[submodule "typescript"]
path = deno_typescript/typescript
url = https://github.com/microsoft/TypeScript.git
fetchRecurseSubmodules = false
shallow = true
7 changes: 0 additions & 7 deletions .prettierignore

This file was deleted.

3 changes: 0 additions & 3 deletions .prettierrc.json

This file was deleted.

4 changes: 4 additions & 0 deletions CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Deno uses
[Rust's Code of Conduct](https://www.rust-lang.org/policies/code-of-conduct). In
the forums, every community member must follow the rules and values expressed
there. Please email [email protected] to report any instance of misconduct.
Loading

0 comments on commit 59f2764

Please sign in to comment.