From 2c0aa5a779d3689d66bc58c29ef6a7b76a6d6ecb Mon Sep 17 00:00:00 2001 From: Mike Nguyen Date: Mon, 19 Aug 2024 16:15:05 +0100 Subject: [PATCH] ci - fixing warnings (#211) * ci: disable caching and conditionally set up go Signed-off-by: mikeee * ci: update actions/checkout to v4 and locks fossa to v1 Signed-off-by: mikeee * ci: fix typo Signed-off-by: mikeee * chore: update ignores to all targets Signed-off-by: mikeee * ci: migrate rust action, auth protoc setup, build examples and proto-gen Signed-off-by: mikeee * fix: change branch name reference to master Signed-off-by: mikeee * ci: bump setup-protoc to v3 Signed-off-by: mikeee * ci: install protoc pinned 24.4 Signed-off-by: mikeee --------- Signed-off-by: mikeee --- .github/workflows/ci.yml | 54 ++++++++++++++----------- .github/workflows/fossa.yml | 6 +-- .github/workflows/validate-examples.yml | 14 ++++--- .gitignore | 2 +- 4 files changed, 42 insertions(+), 34 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2984f68..1874e6e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,8 +15,8 @@ on: env: CARGO_TERM_COLOR: always CARGO_TOKEN: ${{ secrets.CRATES_IO_TOKEN }} - PROTOC_VERSION: 3.x - RUST_TOOLCHAIN: 1.79.0 + PROTOC_VERSION: 24.4 + RUSTUP_TOOLCHAIN: stable jobs: lint: @@ -24,17 +24,17 @@ jobs: runs-on: ubuntu-latest steps: - - name: Install Rust Toolchain - uses: actions-rs/toolchain@v1 + - name: Install Rust + uses: dtolnay/rust-toolchain@master with: - toolchain: ${{ env.RUST_TOOLCHAIN }} - override: true - components: rustfmt, clippy + toolchain: stable + components: clippy, rustfmt - name: Install Protoc - uses: arduino/setup-protoc@v1 + uses: arduino/setup-protoc@v3 with: + repo-token: ${{ secrets.GITHUB_TOKEN }} version: ${{ env.PROTOC_VERSION }} - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: cargo fmt run: cargo fmt -- --check --color ${{ env.CARGO_TERM_COLOR }} - name: cargo clippy @@ -46,21 +46,27 @@ jobs: runs-on: ubuntu-latest steps: - - name: Install Rust Toolchain - uses: actions-rs/toolchain@v1 + - name: Install Rust + uses: dtolnay/rust-toolchain@master with: - toolchain: ${{ env.RUST_TOOLCHAIN }} - override: true - components: rustfmt, clippy + toolchain: stable + components: clippy, rustfmt - name: Install Protoc - uses: arduino/setup-protoc@v1 + uses: arduino/setup-protoc@v3 with: + repo-token: ${{ secrets.GITHUB_TOKEN }} version: ${{ env.PROTOC_VERSION }} - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Build run: cargo build - name: Build examples - run: cargo build --examples + run: | + cd examples + cargo build --examples + - name: Build proto-gen + run: | + cd proto-gen + cargo build - name: Run Tests run: cargo test --all-targets @@ -71,17 +77,17 @@ jobs: if: startswith(github.ref, 'refs/tags/v') steps: - - name: Install Rust Toolchain - uses: actions-rs/toolchain@v1 + - name: Install Rust + uses: dtolnay/rust-toolchain@master with: - toolchain: ${{ env.RUST_TOOLCHAIN }} - override: true - components: rustfmt, clippy + toolchain: stable + components: clippy, rustfmt - name: Install Protoc - uses: arduino/setup-protoc@v1 + uses: arduino/setup-protoc@v3 with: + repo-token: ${{ secrets.GITHUB_TOKEN }} version: ${{ env.PROTOC_VERSION }} - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: cargo publish dapr-macros run: cargo publish --manifest-path dapr-macros/Cargo.toml --token ${{ env.CARGO_TOKEN }} - name: cargo publish dapr diff --git a/.github/workflows/fossa.yml b/.github/workflows/fossa.yml index dadfc55..7042de6 100644 --- a/.github/workflows/fossa.yml +++ b/.github/workflows/fossa.yml @@ -32,15 +32,15 @@ jobs: FOSSA_API_KEY: b88e1f4287c3108c8751bf106fb46db6 # This is a push-only token that is safe to be exposed. steps: - name: "Checkout code" - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: "Run FOSSA Scan" - uses: fossas/fossa-action@main # Use a specific version if locking is preferred + uses: fossas/fossa-action@v1 # Use a specific version if locking is preferred with: api-key: ${{ env.FOSSA_API_KEY }} - name: "Run FOSSA Test" - uses: fossas/fossa-action@main # Use a specific version if locking is preferred + uses: fossas/fossa-action@v1 # Use a specific version if locking is preferred with: api-key: ${{ env.FOSSA_API_KEY }} run-tests: true diff --git a/.github/workflows/validate-examples.yml b/.github/workflows/validate-examples.yml index 4af707a..30d8fd0 100644 --- a/.github/workflows/validate-examples.yml +++ b/.github/workflows/validate-examples.yml @@ -71,11 +71,6 @@ jobs: repository: ${{ env.CHECKOUT_REPO }} ref: ${{ env.CHECKOUT_REF }} - - name: Set up Go - uses: actions/setup-go@v5 - with: - go-version: "stable" - - name: Determine latest Dapr Runtime version if: env.DAPR_RUNTIME_VERSION == '' run: | @@ -106,6 +101,13 @@ jobs: ref: ${{ env.DAPR_REF }} path: dapr_runtime + - name: Set up Go + uses: actions/setup-go@v5 + if: env.DAPR_REF != '' || env.DAPR_CLI_REF != '' + with: + cache: false + go-version: "stable" + - name: Build dapr cli with referenced commit and override version if: env.DAPR_CLI_REF != '' run: | @@ -246,7 +248,7 @@ jobs: - name: Install Protoc uses: arduino/setup-protoc@v3 with: - version: "25.2" + version: "24.4" repo-token: ${{ secrets.GITHUB_TOKEN }} - name: Set up Dapr CLI ${{ env.DAPR_CLI_VERSION }} diff --git a/.gitignore b/.gitignore index 4b3c0e7..7ac2035 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,6 @@ # Generated by Cargo # will have compiled files and executables -/target/ +target/ # Remove Cargo.lock from gitignore if creating an executable, leave it for libraries # More information here https://doc.rust-lang.org/cargo/guide/cargo-toml-vs-cargo-lock.html