From d40d36c6fbe25c77bc77b63a57191943aeaa604d Mon Sep 17 00:00:00 2001 From: Michael Warres Date: Tue, 26 Sep 2023 11:01:55 +0000 Subject: [PATCH 1/4] Update github runner images ubuntu-20.04 -> ubuntu-22.04 windows-2019 -> windows-2022 macos-11 -> macos-12 Signed-off-by: Michael Warres --- .github/workflows/format.yml | 8 +++--- .github/workflows/test.yml | 48 ++++++++++++++++++------------------ 2 files changed, 28 insertions(+), 28 deletions(-) diff --git a/.github/workflows/format.yml b/.github/workflows/format.yml index a09aa7a6..3e249ae3 100644 --- a/.github/workflows/format.yml +++ b/.github/workflows/format.yml @@ -41,7 +41,7 @@ jobs: addlicense: name: verify licenses - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v2 @@ -61,7 +61,7 @@ jobs: buildifier: name: check format with buildifier - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v2 @@ -105,7 +105,7 @@ jobs: clang_format: name: check format with clang-format - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v2 @@ -121,7 +121,7 @@ jobs: clang_tidy: name: check format with clang-tidy - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v2 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 5d311c81..142984f7 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -41,7 +41,7 @@ jobs: test_data: name: build test data - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v2 @@ -109,32 +109,32 @@ jobs: include: - name: 'NullVM on Linux/x86_64' engine: 'null' - os: ubuntu-20.04 + os: ubuntu-22.04 arch: x86_64 action: test flags: --config=gcc - name: 'NullVM on Linux/x86_64 with ASan' engine: 'null' - os: ubuntu-20.04 + os: ubuntu-22.04 arch: x86_64 action: test flags: --config=clang-asan-strict --define=crypto=system - name: 'NullVM on Linux/x86_64 with TSan' engine: 'null' - os: ubuntu-20.04 + os: ubuntu-22.04 arch: x86_64 action: test flags: --config=clang-tsan - name: 'NullVM on Windows/x86_64' engine: 'null' - os: windows-2019 + os: windows-2022 arch: x86_64 action: test targets: -//test/fuzz/... - name: 'V8 on Linux/x86_64' engine: 'v8' repo: 'v8' - os: ubuntu-20.04 + os: ubuntu-22.04 arch: x86_64 action: test flags: --config=clang --define=crypto=system @@ -142,7 +142,7 @@ jobs: - name: 'V8 on Linux/x86_64 with ASan' engine: 'v8' repo: 'v8' - os: ubuntu-20.04 + os: ubuntu-22.04 arch: x86_64 action: test flags: --config=clang-asan @@ -150,7 +150,7 @@ jobs: - name: 'V8 on Linux/x86_64 with TSan' engine: 'v8' repo: 'v8' - os: ubuntu-20.04 + os: ubuntu-22.04 arch: x86_64 action: test flags: --config=clang-tsan @@ -158,7 +158,7 @@ jobs: - name: 'V8 on Linux/x86_64 with GCC' engine: 'v8' repo: 'v8' - os: ubuntu-20.04 + os: ubuntu-22.04 arch: x86_64 action: test flags: --config=gcc @@ -166,7 +166,7 @@ jobs: - name: 'V8 on Linux/aarch64' engine: 'v8' repo: 'v8' - os: ubuntu-20.04 + os: ubuntu-22.04 arch: aarch64 action: test targets: -//test/fuzz/... @@ -176,27 +176,27 @@ jobs: - name: 'V8 on macOS/x86_64' engine: 'v8' repo: 'v8' - os: macos-11 + os: macos-12 arch: x86_64 action: test cache: true - name: 'WAMR interp on Linux/x86_64' engine: 'wamr-interp' repo: 'com_github_bytecodealliance_wasm_micro_runtime' - os: ubuntu-20.04 + os: ubuntu-22.04 arch: x86_64 action: test flags: --config=clang - name: 'WAMR interp on macOS/x86_64' engine: 'wamr-interp' repo: 'com_github_bytecodealliance_wasm_micro_runtime' - os: macos-11 + os: macos-12 arch: x86_64 action: test - name: 'WAMR jit on Linux/x86_64' engine: 'wamr-jit' repo: 'com_github_bytecodealliance_wasm_micro_runtime' - os: ubuntu-20.04 + os: ubuntu-22.04 arch: x86_64 action: test flags: --config=clang @@ -205,41 +205,41 @@ jobs: - name: 'WAMR jit on macOS/x86_64' engine: 'wamr-jit' repo: 'com_github_bytecodealliance_wasm_micro_runtime' - os: macos-11 + os: macos-12 arch: x86_64 action: test cache: true - name: 'WasmEdge on Linux/x86_64' engine: 'wasmedge' repo: 'com_github_wasmedge_wasmedge' - os: ubuntu-20.04 + os: ubuntu-22.04 arch: x86_64 action: test flags: --config=clang - name: 'WasmEdge on macOS/x86_64' engine: 'wasmedge' repo: 'com_github_wasmedge_wasmedge' - os: macos-11 + os: macos-12 arch: x86_64 action: test - name: 'Wasmtime on Linux/x86_64' engine: 'wasmtime' repo: 'com_github_bytecodealliance_wasmtime' - os: ubuntu-20.04 + os: ubuntu-22.04 arch: x86_64 action: test flags: --config=clang -c opt - name: 'Wasmtime on Linux/x86_64 with ASan' engine: 'wasmtime' repo: 'com_github_bytecodealliance_wasmtime' - os: ubuntu-20.04 + os: ubuntu-22.04 arch: x86_64 action: test flags: --config=clang-asan-strict --define=crypto=system - name: 'Wasmtime on Linux/aarch64' engine: 'wasmtime' repo: 'com_github_bytecodealliance_wasmtime' - os: ubuntu-20.04 + os: ubuntu-22.04 arch: aarch64 action: build flags: --config=zig-cc-linux-aarch64 @@ -247,7 +247,7 @@ jobs: - name: 'Wasmtime on Linux/s390x' engine: 'wasmtime' repo: 'com_github_bytecodealliance_wasmtime' - os: ubuntu-20.04 + os: ubuntu-22.04 arch: s390x action: test flags: --config=clang --test_timeout=1800 @@ -256,20 +256,20 @@ jobs: - name: 'Wasmtime on macOS/x86_64' engine: 'wasmtime' repo: 'com_github_bytecodealliance_wasmtime' - os: macos-11 + os: macos-12 arch: x86_64 action: test - name: 'Wasmtime on Windows/x86_64' engine: 'wasmtime' repo: 'com_github_bytecodealliance_wasmtime' - os: windows-2019 + os: windows-2022 arch: x86_64 action: test targets: -//test/fuzz/... - name: 'WAVM on Linux/x86_64' engine: 'wavm' repo: 'com_github_wavm_wavm' - os: ubuntu-20.04 + os: ubuntu-22.04 arch: x86_64 action: test flags: --config=clang From ab28a940cdaa5b0b6e7de0133d537544159dec87 Mon Sep 17 00:00:00 2001 From: Michael Warres Date: Mon, 22 Jan 2024 20:01:15 +0000 Subject: [PATCH 2/4] Only update ubuntu github runner image Update ubuntu-20.04 -> ubuntu-22.04. Updates to windows and macos runner images that were originally in this PR will be performed separately, per @PiotrSikora suggestion in https://github.com/proxy-wasm/proxy-wasm-cpp-host/pull/375#issuecomment-1736066150. Signed-off-by: Michael Warres --- .github/workflows/test.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 142984f7..92176411 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -127,7 +127,7 @@ jobs: flags: --config=clang-tsan - name: 'NullVM on Windows/x86_64' engine: 'null' - os: windows-2022 + os: windows-2019 arch: x86_64 action: test targets: -//test/fuzz/... @@ -176,7 +176,7 @@ jobs: - name: 'V8 on macOS/x86_64' engine: 'v8' repo: 'v8' - os: macos-12 + os: macos-11 arch: x86_64 action: test cache: true @@ -190,7 +190,7 @@ jobs: - name: 'WAMR interp on macOS/x86_64' engine: 'wamr-interp' repo: 'com_github_bytecodealliance_wasm_micro_runtime' - os: macos-12 + os: macos-11 arch: x86_64 action: test - name: 'WAMR jit on Linux/x86_64' @@ -205,7 +205,7 @@ jobs: - name: 'WAMR jit on macOS/x86_64' engine: 'wamr-jit' repo: 'com_github_bytecodealliance_wasm_micro_runtime' - os: macos-12 + os: macos-11 arch: x86_64 action: test cache: true @@ -219,7 +219,7 @@ jobs: - name: 'WasmEdge on macOS/x86_64' engine: 'wasmedge' repo: 'com_github_wasmedge_wasmedge' - os: macos-12 + os: macos-11 arch: x86_64 action: test - name: 'Wasmtime on Linux/x86_64' @@ -256,13 +256,13 @@ jobs: - name: 'Wasmtime on macOS/x86_64' engine: 'wasmtime' repo: 'com_github_bytecodealliance_wasmtime' - os: macos-12 + os: macos-11 arch: x86_64 action: test - name: 'Wasmtime on Windows/x86_64' engine: 'wasmtime' repo: 'com_github_bytecodealliance_wasmtime' - os: windows-2022 + os: windows-2019 arch: x86_64 action: test targets: -//test/fuzz/... From 167e16ad64722671ceaef9557da33e04baee8feb Mon Sep 17 00:00:00 2001 From: Michael Warres Date: Wed, 31 Jan 2024 15:35:32 +0000 Subject: [PATCH 3/4] Ensure that clang builds use libc++ Signed-off-by: Michael Warres --- .bazelrc | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.bazelrc b/.bazelrc index 86e814d3..854a94ff 100644 --- a/.bazelrc +++ b/.bazelrc @@ -3,10 +3,16 @@ build --action_env=CC build --action_env=CXX build --action_env=PATH -# Use Clang compiler. +# Use Clang compiler with libc++. build:clang --action_env=BAZEL_COMPILER=clang build:clang --action_env=CC=clang build:clang --action_env=CXX=clang++ +build:clang --action_env=CXXFLAGS=-stdlib=libc++ +build:clang --action_env=LDFLAGS=-stdlib=libc++ +build:clang --action_env=BAZEL_CXXOPTS=-stdlib=libc++ +build:clang --action_env=BAZEL_LINKLIBS=-l%:libc++.a:-l%:libc++abi.a +build:clang --action_env=BAZEL_LINKOPTS=-lm:-pthread +build:clang --define force_libcpp=enabled # Common flags for Clang sanitizers. build:clang-xsan --config=clang From 56b675eb0f88b069ab29300e6c150d648bbadbcf Mon Sep 17 00:00:00 2001 From: Michael Warres Date: Wed, 31 Jan 2024 16:42:03 +0000 Subject: [PATCH 4/4] Remove force_libcpp=enabled, which is an Envoy-only thing not relevant here Signed-off-by: Michael Warres --- .bazelrc | 1 - 1 file changed, 1 deletion(-) diff --git a/.bazelrc b/.bazelrc index 854a94ff..dd695443 100644 --- a/.bazelrc +++ b/.bazelrc @@ -12,7 +12,6 @@ build:clang --action_env=LDFLAGS=-stdlib=libc++ build:clang --action_env=BAZEL_CXXOPTS=-stdlib=libc++ build:clang --action_env=BAZEL_LINKLIBS=-l%:libc++.a:-l%:libc++abi.a build:clang --action_env=BAZEL_LINKOPTS=-lm:-pthread -build:clang --define force_libcpp=enabled # Common flags for Clang sanitizers. build:clang-xsan --config=clang