root
/
tabby
mirror of https://gitee.com/zhang_1334717033/tabby.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

refactor: change to vars.RUST_TOOLCHAIN for rust ci (#861) 

* Update docker.yml

* Update ci.yml
r0.6
Meng Zhang 2023-11-22 10:44:11 +08:00 committed by GitHub
parent 2133f8f187
commit 26e5f17664
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.github/workflows/ci.yml vendored
View File

@ -35,7 +35,7 @@ jobs:
- name: Install Rust - name: Install Rust
uses: actions-rs/toolchain@v1 uses: actions-rs/toolchain@v1
with: with:
toolchain: 1.73.0 toolchain: ${{ vars.RUST_TOOLCHAIN }}
- name: Sccache cache - name: Sccache cache
uses: mozilla-actions/sccache-action@v0.0.3 uses: mozilla-actions/sccache-action@v0.0.3
@ -69,10 +69,8 @@ jobs:
include: include:
- os: macos-latest - os: macos-latest
target: aarch64-apple-darwin target: aarch64-apple-darwin
toolchain: 1.73.0
- os: ubuntu-latest - os: ubuntu-latest
target: x86_64-unknown-linux-gnu target: x86_64-unknown-linux-gnu
toolchain: 1.73.0
env: env:
SCCACHE_GHA_ENABLED: true SCCACHE_GHA_ENABLED: true
@ -88,11 +86,11 @@ jobs:
- name: Install Rust - name: Install Rust
uses: actions-rs/toolchain@v1 uses: actions-rs/toolchain@v1
with: with:
toolchain: ${{ matrix.toolchain }} toolchain: ${{ vars.RUST_TOOLCHAIN }}
target: ${{ matrix.target }} target: ${{ matrix.target }}
components: clippy components: clippy
- run: rustup default ${{ matrix.toolchain }} - run: rustup default ${{ vars.RUST_TOOLCHAIN }}
- name: Sccache cache - name: Sccache cache
uses: mozilla-actions/sccache-action@v0.0.3 uses: mozilla-actions/sccache-action@v0.0.3

3
.github/workflows/docker.yml vendored
View File

@ -101,8 +101,7 @@ jobs:
labels: ${{ steps.meta.outputs.labels }} labels: ${{ steps.meta.outputs.labels }}
cache-from: ${{ steps.cache.outputs.cache-from }} cache-from: ${{ steps.cache.outputs.cache-from }}
cache-to: ${{ steps.cache.outputs.cache-to }} cache-to: ${{ steps.cache.outputs.cache-to }}
build-args: | build-args: RUST_TOOLCHAIN=${{ vars.RUST_TOOLCHAIN }}
RUST_TOOLCHAIN=1.73.0
- name: Docker Hub Description - name: Docker Hub Description
uses: peter-evans/dockerhub-description@v3 uses: peter-evans/dockerhub-description@v3