diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 892279f..a9b1507 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -23,25 +23,12 @@ jobs: matrix: os: [ ubuntu-latest ] steps: - - uses: actions/checkout@v2 - - uses: actions-rs/toolchain@v1 - with: - toolchain: stable + - uses: actions/checkout@v6 + - run: rustup update stable - run: rustup component add clippy - - name: Build - uses: actions-rs/cargo@v1 - with: - command: build - - name: Run tests - uses: actions-rs/cargo@v1 - with: - command: test - args: -- --test-threads=1 - - name: Clippy - uses: actions-rs/clippy-check@v1 - with: - args: --all --all-targets --all-features - token: ${{ secrets.GITHUB_TOKEN }} + - run: cargo build + - run: cargo test -- --test-threads=1 + - run: cargo clippy --all --all-targets --all-features build-other: runs-on: ${{ matrix.os }} environment: ci @@ -55,16 +42,8 @@ jobs: matrix: os: [ macos-latest, windows-latest ] steps: - - uses: actions/checkout@v2 - - uses: actions-rs/toolchain@v1 - with: - toolchain: stable - - name: Build - uses: actions-rs/cargo@v1 - with: - command: build - - name: Run tests - uses: actions-rs/cargo@v1 - with: - command: test - args: -- --test-threads=1 + - uses: actions/checkout@v6 + - run: rustup update stable + - run: rustup component add clippy + - run: cargo build + - run: cargo test -- --test-threads=1 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e22b0ab..17ba543 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -12,84 +12,53 @@ jobs: linux: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - uses: actions-rs/toolchain@v1 - with: - toolchain: stable - target: x86_64-unknown-linux-musl - - name: Build default - uses: actions-rs/cargo@v1 - with: - command: build - args: --target x86_64-unknown-linux-musl --release - use-cross: true + - uses: actions/checkout@v6 + - run: rustup update stable + - run: rustup target add x86_64-unknown-linux-musl + - run: cargo install --locked cargo-zigbuild + - run: cargo zigbuild --locked --target x86_64-unknown-linux-musl --release - name: Upload Artifact - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v6 with: name: rocfl-linux-x86_64 path: target/x86_64-unknown-linux-musl/release/rocfl - - name: Build no-s3 - uses: actions-rs/cargo@v1 - with: - command: build - args: --target x86_64-unknown-linux-musl --no-default-features --release - use-cross: true + - run: cargo build --locked --target x86_64-unknown-linux-musl --no-default-features --release - name: Upload Artifact - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v6 with: name: rocfl-linux-x86_64-no-s3 path: target/x86_64-unknown-linux-musl/release/rocfl windows: runs-on: windows-latest steps: - - uses: actions/checkout@v2 - - uses: actions-rs/toolchain@v1 - with: - toolchain: stable - - name: Build default - uses: actions-rs/cargo@v1 - with: - command: build - args: --release + - uses: actions/checkout@v6 + - run: rustup update stable + - run: cargo build --locked --release - name: Upload Artifact - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v6 with: name: rocfl-windows-x86_64.exe path: target/release/rocfl.exe - - name: Build no-s3 - uses: actions-rs/cargo@v1 - with: - command: build - args: --no-default-features --release + - run: cargo build --locked --no-default-features --release - name: Upload Artifact - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v6 with: name: rocfl-windows-x86_64-no-s3.exe path: target/release/rocfl.exe osx: runs-on: macos-latest steps: - - uses: actions/checkout@v2 - - uses: actions-rs/toolchain@v1 - with: - toolchain: stable - - name: Build default - uses: actions-rs/cargo@v1 - with: - command: build - args: --release + - uses: actions/checkout@v6 + - run: rustup update stable + - run: cargo build --locked --release - name: Upload Artifact - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v6 with: name: rocfl-macos-x86_64 path: target/release/rocfl - - name: Build no-s3 - uses: actions-rs/cargo@v1 - with: - command: build - args: --no-default-features --release + - run: cargo build --locked --no-default-features --release - name: Upload Artifact - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v6 with: name: rocfl-macos-x86_64-no-s3 path: target/release/rocfl \ No newline at end of file