From 20f03a046c86e936796afb3e42e14182ced25cb9 Mon Sep 17 00:00:00 2001 From: Yi Lin Date: Wed, 24 Jan 2024 11:01:20 +1300 Subject: [PATCH 1/5] Escape + in the branch name for the workflow trigger (#117) According to https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#onpull_requestpull_request_targetbranchesbranches-ignore, `+` that appears in the branch name needs to be escaped. Co-authored-by: Eduardo Souza (cherry picked from commit b40af34d567dc3edc6cc0e4722409dd06330fb2c) --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7f58cdb4..30bf8e28 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -4,8 +4,8 @@ on: pull_request: branches: - master - - v1.8.2+RAI - - v1.9.2+RAI + - v1.8.2\+RAI + - v1.9.2\+RAI concurrency: # Cancels pending runs when a PR gets updated. From 1224104e27a3b5b4e8a50df58a8e5254fcb54a58 Mon Sep 17 00:00:00 2001 From: Yi Lin Date: Tue, 23 Jan 2024 03:47:57 +0000 Subject: [PATCH 2/5] Update the Julia commit --- mmtk/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mmtk/Cargo.toml b/mmtk/Cargo.toml index 7483f097..6a55cf65 100644 --- a/mmtk/Cargo.toml +++ b/mmtk/Cargo.toml @@ -10,7 +10,7 @@ edition = "2018" [package.metadata.julia] # Our CI matches the following line and extract mmtk/julia. If this line is updated, please check ci yaml files and make sure it works. julia_repo = "https://github.com/mmtk/julia.git" -julia_version = "5c406d9bb20d76e2298a6101f171cfac491f651c" +julia_version = "c01026c91a3e2e6a064e75e0d4d4cc2f8c0d4c77" [lib] crate-type = ["cdylib"] From 2e3e295852a9ee76a8ed41a876c3902581c0ee56 Mon Sep 17 00:00:00 2001 From: Yi Lin Date: Wed, 24 Jan 2024 02:44:53 +0000 Subject: [PATCH 3/5] Skip Profile tests --- .github/scripts/ci-test-stdlib.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/scripts/ci-test-stdlib.sh b/.github/scripts/ci-test-stdlib.sh index f2858768..c7233039 100755 --- a/.github/scripts/ci-test-stdlib.sh +++ b/.github/scripts/ci-test-stdlib.sh @@ -22,6 +22,8 @@ declare -a tests_to_skip=( "SparseArrays" # Running LinearAlgebra in a separate job "LinearAlgebra" + # This is failing for v1.9.2 on the stock Julia as well. + "Profile" ) # These tests need multiple workers. declare -a tests_with_multi_workers=( From 4ecc3b8add91679430d3c1f16fbc8544981278a9 Mon Sep 17 00:00:00 2001 From: Eduardo Souza Date: Wed, 24 Jan 2024 03:52:18 +0000 Subject: [PATCH 4/5] Skipping specific tests in Profile --- .github/scripts/ci-test-patching.sh | 6 ++++++ .github/scripts/ci-test-stdlib.sh | 2 -- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/scripts/ci-test-patching.sh b/.github/scripts/ci-test-patching.sh index 4090d779..218dce38 100755 --- a/.github/scripts/ci-test-patching.sh +++ b/.github/scripts/ci-test-patching.sh @@ -28,6 +28,12 @@ declare -a tests_to_skip=( # The required string int.jl does not appear in the output even if I test with the stock Julia code. # I do not know what is wrong, but at this point, I dont want to spend time on it. '@test occursin("int.jl", code)' "$JULIA_PATH/test/cmdlineargs.jl" + + # These are failing for v1.9.2 on the stock Julia as well. + '@test process_running(p)' "$JULIA_PATH/stdlib/Profile/test/runtests.jl" + '@test occursin("Overhead ╎", s)' "$JULIA_PATH/stdlib/Profile/test/runtests.jl" + '@test length(prof.allocs) >= 1' "$JULIA_PATH/stdlib/Profile/test/allocs.jl" + '@test length(\[a for a in prof.allocs if a.type == MyType\]) >= 1' "$JULIA_PATH/stdlib/Profile/test/allocs.jl" ) for (( i=0; i < ${#tests_to_skip[@]}; i+=2 )); do diff --git a/.github/scripts/ci-test-stdlib.sh b/.github/scripts/ci-test-stdlib.sh index c7233039..f2858768 100755 --- a/.github/scripts/ci-test-stdlib.sh +++ b/.github/scripts/ci-test-stdlib.sh @@ -22,8 +22,6 @@ declare -a tests_to_skip=( "SparseArrays" # Running LinearAlgebra in a separate job "LinearAlgebra" - # This is failing for v1.9.2 on the stock Julia as well. - "Profile" ) # These tests need multiple workers. declare -a tests_with_multi_workers=( From 9dd6ace762a8bff7b1feddaff19dd47ffce8e434 Mon Sep 17 00:00:00 2001 From: Eduardo Souza Date: Wed, 24 Jan 2024 05:37:12 +0000 Subject: [PATCH 5/5] Patching tests before running build-test-stdlib --- .github/workflows/binding-tests.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/binding-tests.yml b/.github/workflows/binding-tests.yml index f5be174b..823fa9fc 100644 --- a/.github/workflows/binding-tests.yml +++ b/.github/workflows/binding-tests.yml @@ -51,6 +51,9 @@ jobs: run: | ./.github/scripts/ci-checkout.sh ./.github/scripts/ci-setup.sh + - name: Patching unsupported tests + run: | + ./.github/scripts/ci-test-patching.sh - name: Build Julia (Release) run: | ./.github/scripts/ci-build.sh release ${{ inputs.gc_plan }}