Skip to content

Commit 3830168

Browse files
authored
Change the default testing branch for Julia tests (#1221)
We recently re-organised branches in `mmtk-julia` and `julia`. Namely the previous `master` was renamed to `dev`, and we will use `master` for the version that works with Julia upstream. This PR extracts the default testing repos and branches, and changes the default testing branch for Julia.
1 parent 618fde4 commit 3830168

File tree

2 files changed

+17
-1
lines changed

2 files changed

+17
-1
lines changed

.github/workflows/extended-tests-bindings.yml

+5
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,11 @@ jobs:
125125
./.github/scripts/ci-setup.sh
126126
sed -i 's/^mmtk[[:space:]]=/#ci:mmtk=/g' mmtk/Cargo.toml
127127
sed -i 's/^#[[:space:]]mmtk/mmtk/g' mmtk/Cargo.toml
128+
# removing these two LLVM installations as they cause a conflict within bindgen
129+
- name: Hack to make bindgen work for Github images
130+
run: |
131+
sudo rm -rf /usr/lib/llvm-14
132+
sudo rm -rf /usr/lib/llvm-13
128133
- name: Overwrite MMTk core in Julia binding
129134
run: |
130135
mkdir -p mmtk-julia/repos/mmtk-core

.github/workflows/pr-binding-refs.yml

+12-1
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,17 @@ on:
6969
jobs:
7070
binding-refs:
7171
runs-on: ubuntu-latest
72+
env:
73+
OPENJDK_BINDING_REPO_DEFAULT: mmtk/mmtk-openjdk
74+
OPENJDK_BINDING_REF_DEFAULT: master
75+
JIKESRVM_BINDING_REPO_DEFAULT: mmtk/mmtk-jikesrvm
76+
JIKESRVM_BINDING_REF_DEFAULT: master
77+
V8_BINDING_REPO_DEFAULT: mmtk/mmtk-v8
78+
V8_BINDING_REF_DEFAULT: master
79+
JULIA_BINDING_REPO_DEFAULT: mmtk/mmtk-julia
80+
JULIA_BINDING_REF_DEFAULT: dev
81+
RUBY_BINDING_REPO_DEFAULT: mmtk/mmtk-ruby
82+
RUBY_BINDING_REF_DEFAULT: master
7283
outputs:
7384
openjdk_binding_repo: ${{ steps.print.outputs.openjdk_binding_repo }}
7485
openjdk_binding_ref: ${{ steps.print.outputs.openjdk_binding_ref }}
@@ -86,7 +97,7 @@ jobs:
8697
with:
8798
pull_request: ${{ inputs.pull_request }}
8899
token: ${{ secrets.GITHUB_TOKEN }}
89-
default_env: 'OPENJDK_BINDING_REPO=mmtk/mmtk-openjdk,OPENJDK_BINDING_REF=master,JIKESRVM_BINDING_REPO=mmtk/mmtk-jikesrvm,JIKESRVM_BINDING_REF=master,V8_BINDING_REPO=mmtk/mmtk-v8,V8_BINDING_REF=master,JULIA_BINDING_REPO=mmtk/mmtk-julia,JULIA_BINDING_REF=master,RUBY_BINDING_REPO=mmtk/mmtk-ruby,RUBY_BINDING_REF=master'
100+
default_env: 'OPENJDK_BINDING_REPO=${{ env.OPENJDK_BINDING_REPO_DEFAULT }},OPENJDK_BINDING_REF=${{ env.OPENJDK_BINDING_REF_DEFAULT }},JIKESRVM_BINDING_REPO=${{ env.JIKESRVM_BINDING_REPO_DEFAULT }},JIKESRVM_BINDING_REF=${{ env.JIKESRVM_BINDING_REF_DEFAULT }},V8_BINDING_REPO=${{ env.V8_BINDING_REPO_DEFAULT }},V8_BINDING_REF=${{ env.V8_BINDING_REF_DEFAULT }},JULIA_BINDING_REPO=${{ env.JULIA_BINDING_REPO_DEFAULT }},JULIA_BINDING_REF=${{ env.JULIA_BINDING_REF_DEFAULT }},RUBY_BINDING_REPO=${{ env.RUBY_BINDING_REPO_DEFAULT }},RUBY_BINDING_REF=${{ env.RUBY_BINDING_REF_DEFAULT }}'
90101
- id: print
91102
run: |
92103
echo "openjdk_binding_repo=${{ env.OPENJDK_BINDING_REPO }}" >> $GITHUB_OUTPUT

0 commit comments

Comments
 (0)