aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBlaž Hrastnik2022-12-13 06:07:20 +0000
committerBlaž Hrastnik2022-12-13 06:07:20 +0000
commit00092a29c4f8ca7402455a9a494147ee3521bd4b (patch)
tree096a389f2701d1e381318c03d195f0c769fb79c5
parentfa436fa680b5bcf6d46666a03ae23b94a74e0414 (diff)
Use dtolnay/rust-toolchain in more places
-rw-r--r--.github/workflows/build.yml9
-rw-r--r--.github/workflows/release.yml42
2 files changed, 26 insertions, 25 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index deeff80e..3a4896f1 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -44,10 +44,7 @@ jobs:
uses: actions/checkout@v3
- name: Install stable toolchain
- uses: helix-editor/rust-toolchain@v1
- with:
- profile: minimal
- override: true
+ uses: dtolnay/rust-toolchain@1.61
- uses: Swatinem/rust-cache@v2
@@ -76,10 +73,8 @@ jobs:
uses: actions/checkout@v3
- name: Install stable toolchain
- uses: helix-editor/rust-toolchain@v1
+ uses: dtolnay/rust-toolchain@1.61
with:
- profile: minimal
- override: true
components: rustfmt, clippy
- uses: Swatinem/rust-cache@v2
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index c242f089..8c105bfc 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -26,10 +26,7 @@ jobs:
uses: actions/checkout@v3
- name: Install stable toolchain
- uses: helix-editor/rust-toolchain@v1
- with:
- profile: minimal
- override: true
+ uses: dtolnay/rust-toolchain@stable
- uses: Swatinem/rust-cache@v2
@@ -47,6 +44,16 @@ jobs:
dist:
name: Dist
needs: [fetch-grammars]
+ env:
+ # For some builds, we use cross to test on 32-bit and big-endian
+ # systems.
+ CARGO: cargo
+ # When CARGO is set to CROSS, this is set to `--target matrix.target`.
+ TARGET_FLAGS:
+ # When CARGO is set to CROSS, TARGET_DIR includes matrix.target.
+ TARGET_DIR: ./target
+ # Emit backtraces on panics.
+ RUST_BACKTRACE: 1
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false # don't fail other jobs if one fails
@@ -107,12 +114,10 @@ jobs:
tar xJf grammars/grammars.tar.xz -C runtime/grammars/sources
- name: Install ${{ matrix.rust }} toolchain
- uses: actions-rs/toolchain@v1
+ uses: dtolnay/rust-toolchain@master
with:
- profile: minimal
toolchain: ${{ matrix.rust }}
target: ${{ matrix.target }}
- override: true
# Install a pre-release version of Cross
# TODO: We need to pre-install Cross because we need cross-rs/cross#591 to
@@ -120,15 +125,20 @@ jobs:
# 0.3.0, which includes cross-rs/cross#591, is released.
- name: Install Cross
if: "matrix.cross"
- run: cargo install cross --git https://github.com/cross-rs/cross.git --rev 47df5c76e7cba682823a0b6aa6d95c17b31ba63a
+ run: |
+ cargo install cross --git https://github.com/cross-rs/cross.git --rev 47df5c76e7cba682823a0b6aa6d95c17b31ba63a
+ echo "CARGO=cross" >> $GITHUB_ENV
+ # echo "TARGET_FLAGS=--target ${{ matrix.target }}" >> $GITHUB_ENV
+ # echo "TARGET_DIR=./target/${{ matrix.target }}" >> $GITHUB_ENV
+
+ - name: Show command used for Cargo
+ run: |
+ echo "cargo command is: ${{ env.CARGO }}"
+ echo "target flag is: ${{ env.TARGET_FLAGS }}"
- name: Run cargo test
- uses: actions-rs/cargo@v1
if: "!matrix.skip_tests"
- with:
- use-cross: ${{ matrix.cross }}
- command: test
- args: --release --locked --target ${{ matrix.target }} --workspace
+ run: ${{ env.CARGO }} test --release --locked --target ${{ matrix.target }} --workspace
- name: Set profile.release.strip = true
shell: bash
@@ -139,11 +149,7 @@ jobs:
EOF
- name: Build release binary
- uses: actions-rs/cargo@v1
- with:
- use-cross: ${{ matrix.cross }}
- command: build
- args: --release --locked --target ${{ matrix.target }}
+ run: ${{ env.CARGO }} build --release --locked --target ${{ matrix.target }}
- name: Build AppImage
shell: bash