From 3830168b884e922ee354b6f19845fb6eec89bf26 Mon Sep 17 00:00:00 2001 From: Yi Lin Date: Fri, 1 Nov 2024 15:02:03 +1300 Subject: [PATCH] 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. --- .github/workflows/extended-tests-bindings.yml | 5 +++++ .github/workflows/pr-binding-refs.yml | 13 ++++++++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/.github/workflows/extended-tests-bindings.yml b/.github/workflows/extended-tests-bindings.yml index 9b351e2328..01ee861295 100644 --- a/.github/workflows/extended-tests-bindings.yml +++ b/.github/workflows/extended-tests-bindings.yml @@ -125,6 +125,11 @@ jobs: ./.github/scripts/ci-setup.sh sed -i 's/^mmtk[[:space:]]=/#ci:mmtk=/g' mmtk/Cargo.toml sed -i 's/^#[[:space:]]mmtk/mmtk/g' mmtk/Cargo.toml + # removing these two LLVM installations as they cause a conflict within bindgen + - name: Hack to make bindgen work for Github images + run: | + sudo rm -rf /usr/lib/llvm-14 + sudo rm -rf /usr/lib/llvm-13 - name: Overwrite MMTk core in Julia binding run: | mkdir -p mmtk-julia/repos/mmtk-core diff --git a/.github/workflows/pr-binding-refs.yml b/.github/workflows/pr-binding-refs.yml index ead250df80..a1f5b9e67b 100644 --- a/.github/workflows/pr-binding-refs.yml +++ b/.github/workflows/pr-binding-refs.yml @@ -69,6 +69,17 @@ on: jobs: binding-refs: runs-on: ubuntu-latest + env: + OPENJDK_BINDING_REPO_DEFAULT: mmtk/mmtk-openjdk + OPENJDK_BINDING_REF_DEFAULT: master + JIKESRVM_BINDING_REPO_DEFAULT: mmtk/mmtk-jikesrvm + JIKESRVM_BINDING_REF_DEFAULT: master + V8_BINDING_REPO_DEFAULT: mmtk/mmtk-v8 + V8_BINDING_REF_DEFAULT: master + JULIA_BINDING_REPO_DEFAULT: mmtk/mmtk-julia + JULIA_BINDING_REF_DEFAULT: dev + RUBY_BINDING_REPO_DEFAULT: mmtk/mmtk-ruby + RUBY_BINDING_REF_DEFAULT: master outputs: openjdk_binding_repo: ${{ steps.print.outputs.openjdk_binding_repo }} openjdk_binding_ref: ${{ steps.print.outputs.openjdk_binding_ref }} @@ -86,7 +97,7 @@ jobs: with: pull_request: ${{ inputs.pull_request }} token: ${{ secrets.GITHUB_TOKEN }} - 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' + 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 }}' - id: print run: | echo "openjdk_binding_repo=${{ env.OPENJDK_BINDING_REPO }}" >> $GITHUB_OUTPUT