Skip to content

Commit

Permalink
build(deps): bump clechasseur/rs-cargo from 2 to 3 in the actions-dep…
Browse files Browse the repository at this point in the history 
…endencies group (Watfaq#670)

* build(deps): bump clechasseur/rs-cargo in the actions-dependencies group

Bumps the actions-dependencies group with 1 update: [clechasseur/rs-cargo](https://github.com/clechasseur/rs-cargo).


Updates `clechasseur/rs-cargo` from 2 to 3
- [Release notes](https://github.com/clechasseur/rs-cargo/releases)
- [Commits](clechasseur/rs-cargo@v2...v3)

---
updated-dependencies:
- dependency-name: clechasseur/rs-cargo
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: actions-dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>

* Update ci.yml

Signed-off-by: Yuwei Ba <dev@watfaq.com>

---------

Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: Yuwei Ba <dev@watfaq.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Yuwei Ba <dev@watfaq.com>
  • Loading branch information
@dependabot @ibigbug @lakako
2 people authored and lakako committed Jan 18, 2025
1 parent 08e153c commit 4936b09
Showing 1 changed file with 43 additions and 46 deletions.
89 changes: 43 additions & 46 deletions .github/workflows/ci.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ name: Build/Test/Release

on:
push:
tags: [ "v*" ]
branches: [ "master" ]
tags: ["v*"]
branches: ["master"]
pull_request:
branches: [ "master" ]
branches: ["master"]

concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
Expand Down Expand Up @@ -35,7 +35,7 @@ jobs:
# target: x86_64-unknown-linux-gnu
# release-name: $target
# toolchain: nightly
# cross: false
# tool: cargo/cross
# postfix: ""
# extra-args: ""
# components: ""
Expand All @@ -44,98 +44,98 @@ jobs:
# Linux x86 gnu
- os: ubuntu-latest
target: x86_64-unknown-linux-gnu
cross: true
tool: cross
extra-args: -F "shadowsocks, tuic, onion"
- os: ubuntu-latest
target: i686-unknown-linux-gnu
cross: true
tool: cross
extra-args: -F "shadowsocks, tuic, onion"
# Linux x86 musl
- os: ubuntu-latest
target: x86_64-unknown-linux-musl
cross: true
tool: cross
extra-args: -F "shadowsocks, tuic, onion"
# Linux x86 gnu static-crt
- os: ubuntu-latest
target: x86_64-unknown-linux-gnu
release-name: x86_64-unknown-linux-gnu-static-crt
cross: true
tool: cross
extra-args: -F "shadowsocks, tuic, onion"
rustflags: "-Ctarget-feature=+crt-static --cfg tokio_unstable"
- os: ubuntu-latest
target: i686-unknown-linux-gnu
release-name: i686-unknown-linux-gnu-static-crt
cross: true
tool: cross
extra-args: -F "shadowsocks, tuic, onion"
rustflags: "-Ctarget-feature=+crt-static --cfg tokio_unstable"
# Linux arm gnu
- os: ubuntu-latest
target: aarch64-unknown-linux-gnu
cross: true
tool: cross
extra-args: -F "shadowsocks, tuic, onion"
- os: ubuntu-latest
target: armv7-unknown-linux-gnueabi
cross: true
tool: cross
extra-args: -F "shadowsocks, tuic, onion"
- os: ubuntu-latest
target: armv7-unknown-linux-gnueabihf
cross: true
tool: cross
extra-args: -F "shadowsocks, tuic, onion"
# Linux arm musl
- os: ubuntu-latest
target: aarch64-unknown-linux-musl
cross: true
tool: cross
extra-args: -F "shadowsocks, tuic, onion"
- os: ubuntu-latest
target: armv7-unknown-linux-musleabihf
cross: true
tool: cross
extra-args: -F "shadowsocks, tuic, onion"
# Linux arm gnu static-crt
- os: ubuntu-latest
target: aarch64-unknown-linux-gnu
release-name: aarch64-unknown-linux-gnu-static-crt
cross: true
tool: cross
extra-args: -F "shadowsocks, tuic, onion"
rustflags: "-Ctarget-feature=+crt-static --cfg tokio_unstable"
- os: ubuntu-latest
target: armv7-unknown-linux-gnueabi
release-name: armv7-unknown-linux-gnueabi-static-crt
cross: true
tool: cross
extra-args: -F "shadowsocks, tuic, onion"
rustflags: "-Ctarget-feature=+crt-static --cfg tokio_unstable"
# Linux RISC-V gnu
- os: ubuntu-latest
target: riscv64gc-unknown-linux-gnu
cross: true
tool: cross
extra-args: -F "shadowsocks, tuic"
# Windows
- os: windows-latest
target: x86_64-pc-windows-msvc
cross: false
tool: cargo
postfix: ".exe"
extra-args: -F "shadowsocks, tuic, onion"
- os: windows-latest
target: i686-pc-windows-msvc
cross: false
tool: cargo
postfix: ".exe"
extra-args: -F "shadowsocks, tuic, onion"
- os: windows-latest
target: aarch64-pc-windows-msvc
cross: false
tool: cargo
postfix: ".exe"
extra-args: -F "shadowsocks,tuic"
# Windows static-crt
- os: windows-latest
target: x86_64-pc-windows-msvc
release-name: x86_64-pc-windows-msvc-static-crt
cross: false
tool: cargo
postfix: ".exe"
extra-args: -F "shadowsocks, tuic, onion"
rustflags: "-Ctarget-feature=+crt-static --cfg tokio_unstable"
- os: windows-latest
target: i686-pc-windows-msvc
release-name: i686-pc-windows-msvc-static-crt
cross: false
tool: cargo
postfix: ".exe"
extra-args: -F "shadowsocks, tuic, onion"
rustflags: >-
Expand All @@ -156,48 +156,48 @@ jobs:
- os: windows-latest
target: aarch64-pc-windows-msvc
release-name: aarch64-pc-windows-msvc-static-crt
cross: false
tool: cargo
postfix: ".exe"
extra-args: -F "shadowsocks, tuic"
rustflags: "-Ctarget-feature=+crt-static --cfg tokio_unstable"
# MacOSX
- os: macos-14
target: x86_64-apple-darwin
cross: false
tool: cargo
extra-args: -F "shadowsocks, tuic, onion"
- os: macos-14
target: aarch64-apple-darwin
cross: false
tool: cargo
extra-args: -F "shadowsocks, tuic, onion"
# MacOSX static-crt
- os: macos-14
target: x86_64-apple-darwin
release-name: x86_64-apple-darwin-static-crt
cross: false
tool: cargo
extra-args: -F "shadowsocks, tuic, onion"
rustflags: "-Ctarget-feature=+crt-static --cfg tokio_unstable"
- os: macos-14
target: aarch64-apple-darwin
release-name: aarch64-apple-darwin-static-crt
cross: false
tool: cargo
extra-args: -F "shadowsocks, tuic, onion"
rustflags: "-Ctarget-feature=+crt-static --cfg tokio_unstable"
# Android
- os: ubuntu-latest
target: aarch64-linux-android
cross: true
tool: cross
extra-args: -F "shadowsocks, tuic, onion"
- os: ubuntu-latest
target: armv7-linux-androideabi
cross: true
tool: cross
extra-args: -F "shadowsocks, tuic, onion"
- os: ubuntu-latest
target: x86_64-linux-android
cross: true
tool: cross
extra-args: -F "shadowsocks, tuic, onion"
- os: ubuntu-latest
target: i686-linux-android
cross: true
tool: cross
extra-args: -F "shadowsocks, tuic, onion"
# Linux mips: tier-3, pity
# Windows gnu: tokio dont work
Expand Down Expand Up @@ -253,27 +253,27 @@ jobs:
echo "CLASH_GIT_SHA=$env:GITHUB_SHA" | Out-File -FilePath $env:GITHUB_ENV -Append
- name: Cargo fmt
uses: clechasseur/rs-cargo@v2
uses: clechasseur/rs-cargo@v3
with:
command: fmt
args: --all -- --check
env:
CLASH_DOCKER_TEST: "true"

- name: Cargo clippy
uses: clechasseur/rs-cargo@v2
uses: clechasseur/rs-cargo@v3
with:
use-cross: ${{ matrix.cross }}
tool: ${{ matrix.tool }}
command: clippy
args: --all --target ${{ matrix.target }} ${{ matrix.extra-args }} -- -D warnings
env:
CLASH_DOCKER_TEST: "true"

- name: Cargo test (docker test on linux)
uses: clechasseur/rs-cargo@v2
uses: clechasseur/rs-cargo@v3
if: startsWith(matrix.os, 'ubuntu')
with:
use-cross: ${{ matrix.cross }}
tool: ${{ matrix.tool }}
command: test
args: --all --target ${{ matrix.target }} ${{ matrix.extra-args }}
env:
Expand All @@ -282,19 +282,19 @@ jobs:
RUSTFLAGS: ${{ matrix.rustflags || '--cfg tokio_unstable' }}

- name: Cargo test (no docker test on windows-non-arm and macos)
uses: clechasseur/rs-cargo@v2
uses: clechasseur/rs-cargo@v3
if: ${{ !startsWith(matrix.os, 'ubuntu') && matrix.target != 'aarch64-pc-windows-msvc' }}
with:
use-cross: ${{ matrix.cross }}
tool: ${{ matrix.tool }}
command: test
args: --all --target ${{ matrix.target }} ${{ matrix.extra-args }}
env:
RUSTFLAGS: ${{ matrix.rustflags || '--cfg tokio_unstable' }}

- name: Cargo build
uses: clechasseur/rs-cargo@v2
uses: clechasseur/rs-cargo@v3
with:
use-cross: ${{ matrix.cross }}
tool: ${{ matrix.tool }}
command: build
args: --release --target ${{ matrix.target }} ${{ matrix.extra-args }}
env:
Expand All @@ -319,7 +319,7 @@ jobs:

release:
name: Release
needs: [ compile ]
needs: [compile]
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
Expand All @@ -331,7 +331,7 @@ jobs:
uses: actions/upload-artifact/merge@v4
with:
name: binaries
pattern: '*'
pattern: "*"
retention-days: 1

- name: Download binaries
Expand Down Expand Up @@ -407,7 +407,7 @@ jobs:
LICENSE*
docker-image:
needs: [ compile ]
needs: [compile]
name: Docker Image
if: ${{ startsWith(github.ref, 'refs/tags/v') }}
runs-on: ubuntu-latest
Expand Down Expand Up @@ -462,6 +462,3 @@ jobs:
platforms: linux/amd64,linux/arm64
push: true
tags: ${{ env.TAG_VERSION }},${{ env.TAG_LATEST }}



0 comments on commit 4936b09

Please sign in to comment.