Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
  • Loading branch information
DaniPopes committed Feb 1, 2024
1 parent da90eb8 commit 80e132b
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/scripts/matrices.py
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ def __init__(
# TODO: Figure out how to make this work
# t_linux_arm = Target("Linux-22.04", "aarch64-unknown-linux-gnu", "linux-aarch64")
t_macos = Target("macos-latest-large", "x86_64-apple-darwin", "macosx-amd64")
t_windows = Target("Windows", "x86_64-pc-windows-msvc", "windows-amd64")
t_windows = Target("windows-latest", "x86_64-pc-windows-msvc", "windows-amd64")
targets = [t_linux_x86, t_windows] if is_pr else [t_linux_x86, t_macos, t_windows]

config = [
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docker-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ env:

jobs:
container:
runs-on: ubuntu-20.04
runs-on: Linux-20.04
# https://docs.github.com/en/actions/reference/authentication-in-a-workflow
permissions:
id-token: write
Expand Down
7 changes: 2 additions & 5 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ jobs:
svm_target_platform: macosx-aarch64
platform: darwin
arch: arm64
- os: Windows
- os: windows-latest
target: x86_64-pc-windows-msvc
svm_target_platform: windows-amd64
platform: win32
Expand Down Expand Up @@ -135,14 +135,11 @@ jobs:
target="${{ matrix.target }}"
flags=()
# TODO: default GHA runners run out of RAM when building with any debug info
flags+=(-j1)
# `keccak-asm` does not support MSVC or aarch64 Linux.
[[ "$target" != *msvc* && "$target" != "aarch64-unknown-linux-gnu" ]] && flags+=(--features=asm-keccak)
# Windows runs out of RAM when building binaries with LLVM
# [[ "$target" == *windows* ]] && flags+=(-j1)
[[ "$target" == *windows* ]] && flags+=(-j1)
[[ "$target" == *windows* ]] && exe=".exe"
Expand Down

0 comments on commit 80e132b

Please sign in to comment.