From 3bf38ea693bdfe71505ce856f322df5cb7a26636 Mon Sep 17 00:00:00 2001 From: Leigh McCulloch <351529+leighmcculloch@users.noreply.github.com> Date: Fri, 17 Feb 2023 09:59:20 -0800 Subject: [PATCH 1/4] Re-enable windows and macos builds --- .github/workflows/rust.yml | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index c6e4fc44..ad369368 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -45,14 +45,12 @@ jobs: target: wasm32-unknown-unknown - os: ubuntu-latest target: x86_64-unknown-linux-gnu - # TODO: Address GitHub Actions concurrency limits and re-enable. - # - os: macos-latest - # target: x86_64-apple-darwin - # - os: macos-latest - # target: aarch64-apple-darwin - # TODO: Address disk space usage problems and re-enable. - # - os: windows-latest - # target: x86_64-pc-windows-msvc + - os: macos-latest + target: x86_64-apple-darwin + - os: macos-latest + target: aarch64-apple-darwin + - os: windows-latest + target: x86_64-pc-windows-msvc runs-on: ${{ matrix.sys.os }} steps: - uses: actions/checkout@v3 @@ -71,12 +69,10 @@ jobs: sys: - os: ubuntu-latest target: x86_64-unknown-linux-gnu - # TODO: Address GitHub Actions concurrency limits and re-enable. - # - os: macos-latest - # target: x86_64-apple-darwin - # TODO: Address disk space usage problems and re-enable. - # - os: windows-latest - # target: x86_64-pc-windows-msvc + - os: macos-latest + target: x86_64-apple-darwin + - os: windows-latest + target: x86_64-pc-windows-msvc runs-on: ${{ matrix.sys.os }} steps: - uses: actions/checkout@v3 From f02788029a963c03f59530dc39fc389415c57c77 Mon Sep 17 00:00:00 2001 From: Leigh McCulloch <351529+leighmcculloch@users.noreply.github.com> Date: Fri, 17 Feb 2023 12:13:31 -0800 Subject: [PATCH 2/4] dbg --- .github/workflows/rust.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index ad369368..02203e44 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -57,6 +57,8 @@ jobs: - uses: stellar/actions/rust-cache@main - run: rustup update - run: rustup target add ${{ matrix.sys.target }} + - run: which cargo + - run: echo $PATH - uses: stellar/binaries@v12 with: name: cargo-hack From 03972ea77bdcbd9e4b2feae719cfb9c7304a2604 Mon Sep 17 00:00:00 2001 From: Leigh McCulloch <351529+leighmcculloch@users.noreply.github.com> Date: Fri, 17 Feb 2023 12:59:53 -0800 Subject: [PATCH 3/4] bash --- .github/workflows/rust.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 02203e44..1767103b 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -52,6 +52,9 @@ jobs: - os: windows-latest target: x86_64-pc-windows-msvc runs-on: ${{ matrix.sys.os }} + defaults: + run: + shell: bash steps: - uses: actions/checkout@v3 - uses: stellar/actions/rust-cache@main @@ -76,6 +79,9 @@ jobs: - os: windows-latest target: x86_64-pc-windows-msvc runs-on: ${{ matrix.sys.os }} + defaults: + run: + shell: bash steps: - uses: actions/checkout@v3 - uses: stellar/actions/rust-cache@main From 938f66f22e8e9b2fb15cf2504480a3929c971daa Mon Sep 17 00:00:00 2001 From: Leigh McCulloch <351529+leighmcculloch@users.noreply.github.com> Date: Fri, 17 Feb 2023 18:17:29 -0800 Subject: [PATCH 4/4] try --- .github/workflows/rust.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 1767103b..86cbec9d 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -62,11 +62,12 @@ jobs: - run: rustup target add ${{ matrix.sys.target }} - run: which cargo - run: echo $PATH + - run: cargo --list - uses: stellar/binaries@v12 with: name: cargo-hack version: 0.5.16 - - run: cargo hack clippy $CARGO_HACK_ARGS --target ${{ matrix.sys.target }} --all-targets + - run: cargo-hack hack clippy $CARGO_HACK_ARGS --target ${{ matrix.sys.target }} --all-targets test: strategy: