Skip to content

Commit

Permalink
Merge branch 'main' into perf/ops-permission-check
Browse files Browse the repository at this point in the history
  • Loading branch information
AaronO committed Sep 21, 2021
2 parents 251a60b + 22a6f41 commit f576725
Show file tree
Hide file tree
Showing 328 changed files with 35,121 additions and 27,478 deletions.
4 changes: 2 additions & 2 deletions .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM mcr.microsoft.com/vscode/devcontainers/rust:0-1

# Update to Rust 1.54.0
RUN rustup update 1.54.0 && rustup default 1.54.0
# Update to Rust 1.55.0
RUN rustup update 1.55.0 && rustup default 1.55.0

# Install Deno
ENV DENO_INSTALL=/usr/local
Expand Down
11 changes: 5 additions & 6 deletions .dprint.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
{
"$schema": "https://dprint.dev/schemas/v0.json",
"projectType": "openSource",
"incremental": true,
"typescript": {
"deno": true
Expand All @@ -26,6 +24,7 @@
"cli/tests/testdata/badly_formatted.md",
"cli/tests/testdata/badly_formatted.json",
"cli/tests/testdata/byte_order_mark.ts",
"cli/tests/testdata/fmt/*",
"cli/tsc/*typescript.js",
"test_util/std",
"test_util/wpt",
Expand All @@ -36,9 +35,9 @@
"tools/wpt/manifest.json"
],
"plugins": [
"https://plugins.dprint.dev/typescript-0.50.0.wasm",
"https://plugins.dprint.dev/json-0.12.1.wasm",
"https://plugins.dprint.dev/markdown-0.9.2.wasm",
"https://plugins.dprint.dev/toml-0.4.1.wasm"
"https://plugins.dprint.dev/typescript-0.54.0.wasm",
"https://plugins.dprint.dev/json-0.13.0.wasm",
"https://plugins.dprint.dev/markdown-0.10.0.wasm",
"https://plugins.dprint.dev/toml-0.5.1.wasm"
]
}
2 changes: 2 additions & 0 deletions .github/stale.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ exemptLabels:
- bug
- suggestion
- feat
- refactor
- chore
- tests
- build
- docs
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
# 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 if any of the stages fails (which can be a false negative).
# prevented if any of the stages fail (which can be a false negative).
fail-fast: ${{ github.event_name == 'pull_request' ||
(github.ref != 'refs/heads/main' &&
!startsWith(github.ref, 'refs/tags/')) }}
Expand Down Expand Up @@ -78,7 +78,7 @@ jobs:
- name: Install Rust
uses: hecrj/setup-rust-action@v1
with:
rust-version: 1.54.0
rust-version: 1.55.0

- name: Install clippy and rustfmt
if: matrix.job == 'lint'
Expand All @@ -89,7 +89,7 @@ jobs:
- name: Install Deno
if: matrix.job == 'lint'
run: |
curl -fsSL https://deno.land/x/install/install.sh | sh -s v1.11.3
curl -fsSL https://deno.land/x/install/install.sh | sh -s v1.13.2
echo "$HOME/.deno/bin" >> $GITHUB_PATH
- name: Install Python
Expand Down Expand Up @@ -254,7 +254,7 @@ jobs:
~/.cargo/registry/index
~/.cargo/registry/cache
~/.cargo/git/db
key: g-cargo-home-${{ matrix.os }}-${{ hashFiles('Cargo.lock') }}
key: h-cargo-home-${{ matrix.os }}-${{ hashFiles('Cargo.lock') }}

# In main branch, always creates fresh cache
- name: Cache build output (main)
Expand All @@ -269,7 +269,7 @@ jobs:
!./target/*/*.zip
!./target/*/*.tar.gz
key: |
g-cargo-target-${{ matrix.os }}-${{ matrix.profile }}-${{ github.sha }}
h-cargo-target-${{ matrix.os }}-${{ matrix.profile }}-${{ github.sha }}
# Restore cache from the latest 'main' branch build.
- name: Cache build output (PR)
Expand All @@ -285,7 +285,7 @@ jobs:
!./target/*/*.tar.gz
key: never_saved
restore-keys: |
g-cargo-target-${{ matrix.os }}-${{ matrix.profile }}-
h-cargo-target-${{ matrix.os }}-${{ matrix.profile }}-
# Don't save cache after building PRs or branches other than 'main'.
- name: Skip save cache (PR)
Expand Down
Loading

0 comments on commit f576725

Please sign in to comment.