aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.github/workflows/ci.yaml8
-rw-r--r--Cargo.lock1
-rw-r--r--bors.toml2
3 files changed, 10 insertions, 1 deletions
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index a19bc9ad3..77f2e2e16 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -42,6 +42,14 @@ jobs:
42 if: matrix.os == 'windows-latest' 42 if: matrix.os == 'windows-latest'
43 run: Rename-Item C:\Users\runneradmin\.rustup\toolchains\stable-x86_64-pc-windows-msvc C:\Users\runneradmin\.rustup\toolchains\stable-x86_64-pc-windows-msvc.old 43 run: Rename-Item C:\Users\runneradmin\.rustup\toolchains\stable-x86_64-pc-windows-msvc C:\Users\runneradmin\.rustup\toolchains\stable-x86_64-pc-windows-msvc.old
44 44
45 # Work around https://github.com/actions/cache/issues/403 by using GNU tar
46 # instead of BSD tar.
47 - name: Install GNU tar
48 if: matrix.os == 'macos-latest'
49 run: |
50 brew install gnu-tar
51 echo PATH="/usr/local/opt/gnu-tar/libexec/gnubin:$PATH" >> $GITHUB_ENV
52
45 - name: Install Rust toolchain 53 - name: Install Rust toolchain
46 uses: actions-rs/toolchain@v1 54 uses: actions-rs/toolchain@v1
47 with: 55 with:
diff --git a/Cargo.lock b/Cargo.lock
index fdb62e6ea..320f70529 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1,5 +1,6 @@
1# This file is automatically @generated by Cargo. 1# This file is automatically @generated by Cargo.
2# It is not intended for manual editing. 2# It is not intended for manual editing.
3# asdasdasdasd
3[[package]] 4[[package]]
4name = "addr2line" 5name = "addr2line"
5version = "0.13.0" 6version = "0.13.0"
diff --git a/bors.toml b/bors.toml
index 4c980a24d..1f4eb510a 100644
--- a/bors.toml
+++ b/bors.toml
@@ -1,7 +1,7 @@
1status = [ 1status = [
2 "Rust (ubuntu-latest)", 2 "Rust (ubuntu-latest)",
3 "Rust (windows-latest)", 3 "Rust (windows-latest)",
4 # "Rust (macos-latest)", 4 "Rust (macos-latest)",
5 "TypeScript (ubuntu-latest)", 5 "TypeScript (ubuntu-latest)",
6 "TypeScript (windows-latest)", 6 "TypeScript (windows-latest)",
7] 7]