Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Escape + in the branch name for the workflow trigger (backport #117) #120

Merged
merged 5 commits into from
Jan 24, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .github/scripts/ci-test-patching.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/binding-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion mmtk/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
Expand Down
Loading