Skip to content

Commit 8712792

Browse files
mergify[bot]qinsoonudesou
authored
Escape + in the branch name for the workflow trigger (backport #117) (#120)
This is an automatic backport of pull request #117 done by [Mergify](https://mergify.com). --- <details> <summary>Mergify commands and options</summary> <br /> More conditions and actions can be found in the [documentation](https://docs.mergify.com/). You can also trigger Mergify actions by commenting on this pull request: - `@Mergifyio refresh` will re-evaluate the rules - `@Mergifyio rebase` will rebase this PR on its base branch - `@Mergifyio update` will merge the base branch into this PR - `@Mergifyio backport <destination>` will backport this PR on `<destination>` branch Additionally, on Mergify [dashboard](https://dashboard.mergify.com) you can: - look at your merge queues - generate the Mergify configuration with the config editor. Finally, you can contact us on https://mergify.com </details> --------- Co-authored-by: Yi Lin <[email protected]> Co-authored-by: Eduardo Souza <[email protected]>
1 parent 7d6acfe commit 8712792

File tree

4 files changed

+12
-3
lines changed

4 files changed

+12
-3
lines changed

.github/scripts/ci-test-patching.sh

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,12 @@ declare -a tests_to_skip=(
2828
# The required string int.jl does not appear in the output even if I test with the stock Julia code.
2929
# I do not know what is wrong, but at this point, I dont want to spend time on it.
3030
'@test occursin("int.jl", code)' "$JULIA_PATH/test/cmdlineargs.jl"
31+
32+
# These are failing for v1.9.2 on the stock Julia as well.
33+
'@test process_running(p)' "$JULIA_PATH/stdlib/Profile/test/runtests.jl"
34+
'@test occursin("Overhead ╎", s)' "$JULIA_PATH/stdlib/Profile/test/runtests.jl"
35+
'@test length(prof.allocs) >= 1' "$JULIA_PATH/stdlib/Profile/test/allocs.jl"
36+
'@test length(\[a for a in prof.allocs if a.type == MyType\]) >= 1' "$JULIA_PATH/stdlib/Profile/test/allocs.jl"
3137
)
3238

3339
for (( i=0; i < ${#tests_to_skip[@]}; i+=2 )); do

.github/workflows/binding-tests.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,9 @@ jobs:
5151
run: |
5252
./.github/scripts/ci-checkout.sh
5353
./.github/scripts/ci-setup.sh
54+
- name: Patching unsupported tests
55+
run: |
56+
./.github/scripts/ci-test-patching.sh
5457
- name: Build Julia (Release)
5558
run: |
5659
./.github/scripts/ci-build.sh release ${{ inputs.gc_plan }}

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ on:
44
pull_request:
55
branches:
66
- master
7-
- v1.8.2+RAI
8-
- v1.9.2+RAI
7+
- v1.8.2\+RAI
8+
- v1.9.2\+RAI
99

1010
concurrency:
1111
# Cancels pending runs when a PR gets updated.

mmtk/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ edition = "2018"
1010
[package.metadata.julia]
1111
# 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.
1212
julia_repo = "https://github.com/mmtk/julia.git"
13-
julia_version = "5c406d9bb20d76e2298a6101f171cfac491f651c"
13+
julia_version = "c01026c91a3e2e6a064e75e0d4d4cc2f8c0d4c77"
1414

1515
[lib]
1616
crate-type = ["cdylib"]

0 commit comments

Comments
 (0)