Skip to content

Commit

Permalink
chore(ci): remove windows build (#902)
Browse files Browse the repository at this point in the history
  • Loading branch information
dancoombs committed Nov 25, 2024
1 parent 1784ba0 commit bde9f8c
Show file tree
Hide file tree
Showing 6 changed files with 24 additions and 13 deletions.
4 changes: 3 additions & 1 deletion .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,10 @@ jobs:
cache-on-failure: true
- name: Install Foundry
uses: foundry-rs/foundry-toolchain@v1
# Build to generate the ABI bindings.
with:
version: "nightly-fe2acca4e379793539db80e032d76ffe0110298b"

# Build to generate the ABI bindings.
- name: cargo build
uses: actions-rs/cargo@v1
with:
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/compliance.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ jobs:

- name: Install Foundry
uses: foundry-rs/foundry-toolchain@v1
with:
version: "nightly-fe2acca4e379793539db80e032d76ffe0110298b"

- uses: KengoTODA/actions-setup-docker-compose@v1
with:
Expand Down
22 changes: 12 additions & 10 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,6 @@ jobs:
- target: aarch64-apple-darwin
os: macos-latest
profile: release
- target: x86_64-pc-windows-gnu
os: ubuntu-20.04
profile: release

steps:
- uses: actions/checkout@v4
Expand All @@ -66,6 +63,9 @@ jobs:
- name: Foundry install
if: contains( ${{ matrix.target }}, 'apple')
uses: foundry-rs/foundry-toolchain@v1
with:
version: "nightly-fe2acca4e379793539db80e032d76ffe0110298b"

- name: Install protobuf
if: contains( ${{ matrix.target }}, 'apple')
uses: arduino/setup-protoc@v3
Expand Down Expand Up @@ -93,8 +93,7 @@ jobs:
- name: Move cross-compiled binary
run: |
mkdir artifacts
[[ "${{ matrix.target }}" == *windows* ]] && ext=".exe"
sudo mv "target/${{ matrix.target }}/${{ matrix.profile }}/rundler${ext}" ./artifacts
sudo mv "target/${{ matrix.target }}/${{ matrix.profile }}/rundler" ./artifacts
# ==============================
# Signing
Expand All @@ -118,13 +117,13 @@ jobs:
# This is required to share artifacts between different jobs
# =======================================================================
- name: Upload artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: rundler-${{ needs.extract-version.outputs.VERSION }}-${{ matrix.target }}.tar.gz
path: rundler-${{ needs.extract-version.outputs.VERSION }}-${{ matrix.target }}.tar.gz

- name: Upload signature
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: rundler-${{ needs.extract-version.outputs.VERSION }}-${{ matrix.target }}.tar.gz.asc
path: rundler-${{ needs.extract-version.outputs.VERSION }}-${{ matrix.target }}.tar.gz.asc
Expand All @@ -150,6 +149,10 @@ jobs:
# ==============================
- name: Download artifacts
uses: actions/download-artifact@v4
with:
path: artifacts
pattern: rundler-*
merge-multiple: true

# ==============================
# Create release draft
Expand Down Expand Up @@ -204,7 +207,6 @@ jobs:
|:---:|:---:|:---:|:---|
| <img src="https://simpleicons.org/icons/linux.svg" style="width: 32px;"/> | x86_64 | [rundler-${{ env.VERSION }}-x86_64-unknown-linux-gnu.tar.gz](https://github.com/${{ env.REPO_NAME }}/releases/download/${{ env.VERSION }}/rundler-${{ env.VERSION }}-x86_64-unknown-linux-gnu.tar.gz) | [PGP Signature](https://github.com/${{ env.REPO_NAME }}/releases/download/${{ env.VERSION }}/rundler-${{ env.VERSION }}-x86_64-unknown-linux-gnu.tar.gz.asc) |
| <img src="https://simpleicons.org/icons/linux.svg" style="width: 32px;"/> | aarch64 | [rundler-${{ env.VERSION }}-aarch64-unknown-linux-gnu.tar.gz](https://github.com/${{ env.REPO_NAME }}/releases/download/${{ env.VERSION }}/rundler-${{ env.VERSION }}-aarch64-unknown-linux-gnu.tar.gz) | [PGP Signature](https://github.com/${{ env.REPO_NAME }}/releases/download/${{ env.VERSION }}/rundler-${{ env.VERSION }}-aarch64-unknown-linux-gnu.tar.gz.asc) |
| <img src="https://simpleicons.org/icons/windows.svg" style="width: 32px;"/> | x86_64 | [rundler-${{ env.VERSION }}-x86_64-pc-windows-gnu.tar.gz](https://github.com/${{ env.REPO_NAME }}/releases/download/${{ env.VERSION }}/rundler-${{ env.VERSION }}-x86_64-pc-windows-gnu.tar.gz) | [PGP Signature](https://github.com/${{ env.REPO_NAME }}/releases/download/${{ env.VERSION }}/rundler-${{ env.VERSION }}-x86_64-pc-windows-gnu.tar.gz.asc) |
| <img src="https://simpleicons.org/icons/apple.svg" style="width: 32px;"/> | x86_64 | [rundler-${{ env.VERSION }}-x86_64-apple-darwin.tar.gz](https://github.com/${{ env.REPO_NAME }}/releases/download/${{ env.VERSION }}/rundler-${{ env.VERSION }}-x86_64-apple-darwin.tar.gz) | [PGP Signature](https://github.com/${{ env.REPO_NAME }}/releases/download/${{ env.VERSION }}/rundler-${{ env.VERSION }}-x86_64-apple-darwin.tar.gz.asc) |
| <img src="https://simpleicons.org/icons/apple.svg" style="width: 32px;"/> | aarch64 | [rundler-${{ env.VERSION }}-aarch64-apple-darwin.tar.gz](https://github.com/${{ env.REPO_NAME }}/releases/download/${{ env.VERSION }}/rundler-${{ env.VERSION }}-aarch64-apple-darwin.tar.gz) | [PGP Signature](https://github.com/${{ env.REPO_NAME }}/releases/download/${{ env.VERSION }}/rundler-${{ env.VERSION }}-aarch64-apple-darwin.tar.gz.asc) |
| | | | |
Expand All @@ -214,8 +216,8 @@ jobs:
ENDBODY
)
assets=()
for asset in ./rundler-*.tar.gz*; do
assets+=("$asset/$asset")
for asset in artifacts/rundler-*.tar.gz*; do
assets+=("$asset")
done
tag_name="${{ env.VERSION }}"
echo "$body" | gh release create --draft -t "Rundler $tag_name" -F "-" "$tag_name" "${assets[@]}"
2 changes: 2 additions & 0 deletions .github/workflows/unit.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@ jobs:

- name: Install Foundry
uses: foundry-rs/foundry-toolchain@v1
with:
version: "nightly-fe2acca4e379793539db80e032d76ffe0110298b"

- name: Install latest nextest release
uses: taiki-e/install-action@nextest
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.build
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
ARG CROSS_BASE_IMAGE

FROM ghcr.io/foundry-rs/foundry:nightly-ac802618e15039b31e464ae6d1fe3ee39f87cefd as foundry
FROM ghcr.io/foundry-rs/foundry:nightly-fe2acca4e379793539db80e032d76ffe0110298b as foundry

FROM $CROSS_BASE_IMAGE
COPY --from=foundry /usr/local/bin/forge /usr/local/bin/forge
Expand Down
5 changes: 4 additions & 1 deletion crates/pool/src/mempool/uo_pool.rs
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,10 @@ where
tracing::error!("Failed to simulate handle op for gas limit efficiency check, failing open: {:?}", e);
}
Ok(Err(e)) => {
tracing::error!("Failed to simulate handle op for gas limit efficiency check, failing open: {:?}", e);
tracing::debug!(
"Validation error during gas limit efficiency check, failing open: {:?}",
e
);
}
Ok(Ok(execution_res)) => {
let total_gas_used: u128 = (execution_res.paid / U256::from(gas_price))
Expand Down

0 comments on commit bde9f8c

Please sign in to comment.