From 80e132bbffffc42f3d2733b46074aade61b0f6e4 Mon Sep 17 00:00:00 2001 From: DaniPopes <57450786+DaniPopes@users.noreply.github.com> Date: Thu, 1 Feb 2024 11:52:47 +0100 Subject: [PATCH] update --- .github/scripts/matrices.py | 2 +- .github/workflows/docker-publish.yml | 2 +- .github/workflows/release.yml | 7 ++----- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/.github/scripts/matrices.py b/.github/scripts/matrices.py index 090ca98bd3ef..99fdc78e735a 100755 --- a/.github/scripts/matrices.py +++ b/.github/scripts/matrices.py @@ -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 = [ diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml index 835fa8b9c8ef..a4d2543c2084 100644 --- a/.github/workflows/docker-publish.yml +++ b/.github/workflows/docker-publish.yml @@ -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 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 04e20f232dfa..776c36e02314 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -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 @@ -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"