From c9c938645214280ea894abfffc184a0f893cffd6 Mon Sep 17 00:00:00 2001 From: Alexander Medvednikov Date: Mon, 1 Jun 2026 01:17:19 +0300 Subject: [PATCH] ci: fix more master failures --- .github/workflows/disable_azure_mirror.sh | 6 ++++++ .github/workflows/vsl_and_vtl_compile_ci.yml | 14 ++++++++++++++ vlib/context/onecontext/onecontext.v | 2 +- 3 files changed, 21 insertions(+), 1 deletion(-) diff --git a/.github/workflows/disable_azure_mirror.sh b/.github/workflows/disable_azure_mirror.sh index 753b9facb..8d236a3ee 100755 --- a/.github/workflows/disable_azure_mirror.sh +++ b/.github/workflows/disable_azure_mirror.sh @@ -5,6 +5,12 @@ echo "APT MIRRORS AFTER:"; cat /etc/apt/apt-mirrors.txt echo "ls -la /etc/apt/sources.list.d/"; ls -la /etc/apt/sources.list.d/ for f in /etc/apt/sources.list.d/*; do echo "####### $f ######"; cat $f; done +for f in /etc/apt/sources.list.d/azure-cli.*; do + if [ -f "$f" ]; then + echo "DISABLE OPTIONAL APT SOURCE: $f" + sudo mv "$f" "$f.disabled" + fi +done echo "APT SOURCES BEFORE:"; echo "ls -la /etc/apt/sources.list"; ls -la /etc/apt/sources.list; cat /etc/apt/sources.list sudo sed -i 's@http://azure.archive.ubuntu.com@http://archive.ubuntu.com@gm' /etc/apt/sources.list diff --git a/.github/workflows/vsl_and_vtl_compile_ci.yml b/.github/workflows/vsl_and_vtl_compile_ci.yml index d0ab35e60..428e15c72 100644 --- a/.github/workflows/vsl_and_vtl_compile_ci.yml +++ b/.github/workflows/vsl_and_vtl_compile_ci.yml @@ -63,6 +63,13 @@ jobs: fi - name: Install vsl run: v retry -- v install vsl + - name: Skip optional Vulkan examples on macOS + if: runner.os == 'macOS' + run: | + for file in "$HOME"/.vmodules/vsl/examples/*vulkan*/*.v; do + [ -e "$file" ] || continue + mv "$file" "${file%.v}_not_ci.v" + done - name: Test with Pure V Backend run: ~/.vmodules/vsl/bin/test - name: Test with Pure V Backend and Pure V Math @@ -110,6 +117,13 @@ jobs: v retry v install vsl - name: Install vtl run: v retry v install vtl + - name: Skip optional Vulkan examples on macOS + if: runner.os == 'macOS' + run: | + for file in "$HOME"/.vmodules/vtl/examples/*vulkan*/*.v; do + [ -e "$file" ] || continue + mv "$file" "${file%.v}_not_ci.v" + done - name: Test with Pure V Backend run: ~/.vmodules/vtl/bin/test - name: Test with Pure V Backend and Pure V Math diff --git a/vlib/context/onecontext/onecontext.v b/vlib/context/onecontext/onecontext.v index c70f47fcc..8fd49ea5f 100644 --- a/vlib/context/onecontext/onecontext.v +++ b/vlib/context/onecontext/onecontext.v @@ -23,7 +23,7 @@ mut: // it returns the merged context pub fn merge(ctx context.Context, ctxs ...context.Context) (context.Context, context.CancelFn) { mut background := context.background() - cancel_ctx, cancel := context.with_cancel(mut &background) + cancel_ctx, cancel := context.with_cancel(mut background) mut octx := &OneContext{ done: chan int{cap: 3} ctx: ctx -- 2.39.5