From de869c9dbb45aa788d95645020af4fea4f16673b Mon Sep 17 00:00:00 2001 From: Nils Langguth Date: Wed, 10 Sep 2025 10:53:09 +0200 Subject: [PATCH 01/12] add source venv for vm macos test --- .github/workflows/root-ci.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/root-ci.yml b/.github/workflows/root-ci.yml index 029e4de73c02d..225125812127f 100644 --- a/.github/workflows/root-ci.yml +++ b/.github/workflows/root-ci.yml @@ -160,8 +160,9 @@ jobs: build-directory: /Users/sftnight/ROOT-CI/src/ - name: Set up curl CA bundle for Davix to work with https - run: 'echo SSL_CERT_FILE=/opt/local/share/curl/curl-ca-bundle.crt >> $GITHUB_ENV' - + run: 'echo SSL_CERT_FILE=/opt/local/share/curl/curl-ca-bundle.crt >> $GITHUB_ENV' + - name: Source python venv + run: 'source /Users/sftnight/py-venv/ROOT-CI/bin/activate' - name: Pull Request Build if: github.event_name == 'pull_request' env: From 6ea6c3fca3048856486dece99c4ab128d51efff2 Mon Sep 17 00:00:00 2001 From: Nils Langguth Date: Wed, 10 Sep 2025 11:07:12 +0200 Subject: [PATCH 02/12] add check python env mac vm ci --- .github/workflows/root-ci.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/root-ci.yml b/.github/workflows/root-ci.yml index 225125812127f..71919641ed6fe 100644 --- a/.github/workflows/root-ci.yml +++ b/.github/workflows/root-ci.yml @@ -162,7 +162,9 @@ jobs: - name: Set up curl CA bundle for Davix to work with https run: 'echo SSL_CERT_FILE=/opt/local/share/curl/curl-ca-bundle.crt >> $GITHUB_ENV' - name: Source python venv - run: 'source /Users/sftnight/py-venv/ROOT-CI/bin/activate' + run: 'source /Users/sftnight/py-venv/ROOT-CI/bin/activate && python -m site' + - name: Check python venv + run: 'python -m site' - name: Pull Request Build if: github.event_name == 'pull_request' env: From 000dcc6cdb79e32eef7109662b8e2f87415f8896 Mon Sep 17 00:00:00 2001 From: Nils Langguth Date: Wed, 10 Sep 2025 11:13:40 +0200 Subject: [PATCH 03/12] adding python venv source to existing steps in ci for macos vm tests --- .github/workflows/root-ci.yml | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/.github/workflows/root-ci.yml b/.github/workflows/root-ci.yml index 71919641ed6fe..8a37be9019db0 100644 --- a/.github/workflows/root-ci.yml +++ b/.github/workflows/root-ci.yml @@ -161,16 +161,12 @@ jobs: - name: Set up curl CA bundle for Davix to work with https run: 'echo SSL_CERT_FILE=/opt/local/share/curl/curl-ca-bundle.crt >> $GITHUB_ENV' - - name: Source python venv - run: 'source /Users/sftnight/py-venv/ROOT-CI/bin/activate && python -m site' - - name: Check python venv - run: 'python -m site' - name: Pull Request Build if: github.event_name == 'pull_request' env: INCREMENTAL: ${{ !contains(github.event.pull_request.labels.*.name, 'clean build') }} GITHUB_PR_ORIGIN: ${{ github.event.pull_request.head.repo.clone_url }} - run: ".github/workflows/root-ci-config/build_root.py + run: "source /Users/sftnight/py-venv/ROOT-CI/bin/activate && .github/workflows/root-ci-config/build_root.py --buildtype RelWithDebInfo --incremental $INCREMENTAL --base_ref ${{ github.base_ref }} @@ -183,7 +179,7 @@ jobs: - name: Workflow dispatch if: ${{ github.event_name == 'workflow_dispatch' && !matrix.is_special }} - run: ".github/workflows/root-ci-config/build_root.py + run: "source /Users/sftnight/py-venv/ROOT-CI/bin/activate && .github/workflows/root-ci-config/build_root.py --buildtype ${{ inputs.buildtype }} --platform ${{ matrix.platform }} --incremental ${{ inputs.incremental }} @@ -194,7 +190,7 @@ jobs: - name: Nightly build if: github.event_name == 'schedule' - run: ".github/workflows/root-ci-config/build_root.py + run: "source /Users/sftnight/py-venv/ROOT-CI/bin/activate && .github/workflows/root-ci-config/build_root.py --buildtype Release --platform ${{ matrix.platform }} --incremental false @@ -204,7 +200,7 @@ jobs: - name: Update build cache after push to release branch if: github.event_name == 'push' - run: ".github/workflows/root-ci-config/build_root.py + run: "source /Users/sftnight/py-venv/ROOT-CI/bin/activate && .github/workflows/root-ci-config/build_root.py --buildtype RelWithDebInfo --platform ${{ matrix.platform }} --incremental false From f47354fc31c21b32220f60d7ec60c5645c313a60 Mon Sep 17 00:00:00 2001 From: Nils Langguth Date: Wed, 10 Sep 2025 11:17:40 +0200 Subject: [PATCH 04/12] add change to user dir to macos ci --- .github/workflows/root-ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/root-ci.yml b/.github/workflows/root-ci.yml index 8a37be9019db0..db1132d9bf9aa 100644 --- a/.github/workflows/root-ci.yml +++ b/.github/workflows/root-ci.yml @@ -166,7 +166,7 @@ jobs: env: INCREMENTAL: ${{ !contains(github.event.pull_request.labels.*.name, 'clean build') }} GITHUB_PR_ORIGIN: ${{ github.event.pull_request.head.repo.clone_url }} - run: "source /Users/sftnight/py-venv/ROOT-CI/bin/activate && .github/workflows/root-ci-config/build_root.py + run: "cd /Users/sftnight && source /Users/sftnight/py-venv/ROOT-CI/bin/activate && .github/workflows/root-ci-config/build_root.py --buildtype RelWithDebInfo --incremental $INCREMENTAL --base_ref ${{ github.base_ref }} @@ -179,7 +179,7 @@ jobs: - name: Workflow dispatch if: ${{ github.event_name == 'workflow_dispatch' && !matrix.is_special }} - run: "source /Users/sftnight/py-venv/ROOT-CI/bin/activate && .github/workflows/root-ci-config/build_root.py + run: "cd /Users/sftnight && source /Users/sftnight/py-venv/ROOT-CI/bin/activate && .github/workflows/root-ci-config/build_root.py --buildtype ${{ inputs.buildtype }} --platform ${{ matrix.platform }} --incremental ${{ inputs.incremental }} @@ -190,7 +190,7 @@ jobs: - name: Nightly build if: github.event_name == 'schedule' - run: "source /Users/sftnight/py-venv/ROOT-CI/bin/activate && .github/workflows/root-ci-config/build_root.py + run: "cd /Users/sftnight && source /Users/sftnight/py-venv/ROOT-CI/bin/activate && .github/workflows/root-ci-config/build_root.py --buildtype Release --platform ${{ matrix.platform }} --incremental false @@ -200,7 +200,7 @@ jobs: - name: Update build cache after push to release branch if: github.event_name == 'push' - run: "source /Users/sftnight/py-venv/ROOT-CI/bin/activate && .github/workflows/root-ci-config/build_root.py + run: "cd /Users/sftnight && source /Users/sftnight/py-venv/ROOT-CI/bin/activate && .github/workflows/root-ci-config/build_root.py --buildtype RelWithDebInfo --platform ${{ matrix.platform }} --incremental false From fe296c86ab8e562097d7863f8c17d9fbc26c9452 Mon Sep 17 00:00:00 2001 From: Nils Langguth Date: Wed, 10 Sep 2025 11:31:09 +0200 Subject: [PATCH 05/12] Update root-ci.yml --- .github/workflows/root-ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/root-ci.yml b/.github/workflows/root-ci.yml index db1132d9bf9aa..57fe589f03a05 100644 --- a/.github/workflows/root-ci.yml +++ b/.github/workflows/root-ci.yml @@ -166,7 +166,7 @@ jobs: env: INCREMENTAL: ${{ !contains(github.event.pull_request.labels.*.name, 'clean build') }} GITHUB_PR_ORIGIN: ${{ github.event.pull_request.head.repo.clone_url }} - run: "cd /Users/sftnight && source /Users/sftnight/py-venv/ROOT-CI/bin/activate && .github/workflows/root-ci-config/build_root.py + run: "cd /Users/sftnight && source /Users/sftnight/py-venv/ROOT-CI/bin/activate && /.github/workflows/root-ci-config/build_root.py --buildtype RelWithDebInfo --incremental $INCREMENTAL --base_ref ${{ github.base_ref }} @@ -179,7 +179,7 @@ jobs: - name: Workflow dispatch if: ${{ github.event_name == 'workflow_dispatch' && !matrix.is_special }} - run: "cd /Users/sftnight && source /Users/sftnight/py-venv/ROOT-CI/bin/activate && .github/workflows/root-ci-config/build_root.py + run: "cd /Users/sftnight && source /Users/sftnight/py-venv/ROOT-CI/bin/activate && /.github/workflows/root-ci-config/build_root.py --buildtype ${{ inputs.buildtype }} --platform ${{ matrix.platform }} --incremental ${{ inputs.incremental }} @@ -190,7 +190,7 @@ jobs: - name: Nightly build if: github.event_name == 'schedule' - run: "cd /Users/sftnight && source /Users/sftnight/py-venv/ROOT-CI/bin/activate && .github/workflows/root-ci-config/build_root.py + run: "cd /Users/sftnight && source /Users/sftnight/py-venv/ROOT-CI/bin/activate && /.github/workflows/root-ci-config/build_root.py --buildtype Release --platform ${{ matrix.platform }} --incremental false @@ -200,7 +200,7 @@ jobs: - name: Update build cache after push to release branch if: github.event_name == 'push' - run: "cd /Users/sftnight && source /Users/sftnight/py-venv/ROOT-CI/bin/activate && .github/workflows/root-ci-config/build_root.py + run: "cd /Users/sftnight && source /Users/sftnight/py-venv/ROOT-CI/bin/activate && /.github/workflows/root-ci-config/build_root.py --buildtype RelWithDebInfo --platform ${{ matrix.platform }} --incremental false From a46948a09ed8f7674879599cc8d9f5f1fd35aa2e Mon Sep 17 00:00:00 2001 From: Nils Langguth Date: Wed, 10 Sep 2025 11:35:21 +0200 Subject: [PATCH 06/12] Update root-ci.yml --- .github/workflows/root-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/root-ci.yml b/.github/workflows/root-ci.yml index 57fe589f03a05..1bd871742d037 100644 --- a/.github/workflows/root-ci.yml +++ b/.github/workflows/root-ci.yml @@ -116,7 +116,7 @@ jobs: runs-on: # Using '[self-hosted, ..., ...]' does not work for some reason :) - self-hosted - - macOS + - macOS-VM - ${{ matrix.arch }} - ${{ matrix.platform }} From c6ed96ac408a45122f89b9e0d4f972ef39747cc2 Mon Sep 17 00:00:00 2001 From: Nils Langguth Date: Wed, 10 Sep 2025 11:43:02 +0200 Subject: [PATCH 07/12] Update root-ci.yml --- .github/workflows/root-ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/root-ci.yml b/.github/workflows/root-ci.yml index 1bd871742d037..f2fe56c37420c 100644 --- a/.github/workflows/root-ci.yml +++ b/.github/workflows/root-ci.yml @@ -166,7 +166,7 @@ jobs: env: INCREMENTAL: ${{ !contains(github.event.pull_request.labels.*.name, 'clean build') }} GITHUB_PR_ORIGIN: ${{ github.event.pull_request.head.repo.clone_url }} - run: "cd /Users/sftnight && source /Users/sftnight/py-venv/ROOT-CI/bin/activate && /.github/workflows/root-ci-config/build_root.py + run: "cd /Users/sftnight && source /Users/sftnight/py-venv/ROOT-CI/bin/activate && /Users/sftnight/actions-runner/_work/root/root/.github/workflows/root-ci-config/build_root.py --buildtype RelWithDebInfo --incremental $INCREMENTAL --base_ref ${{ github.base_ref }} @@ -179,7 +179,7 @@ jobs: - name: Workflow dispatch if: ${{ github.event_name == 'workflow_dispatch' && !matrix.is_special }} - run: "cd /Users/sftnight && source /Users/sftnight/py-venv/ROOT-CI/bin/activate && /.github/workflows/root-ci-config/build_root.py + run: "cd /Users/sftnight && source /Users/sftnight/py-venv/ROOT-CI/bin/activate && /Users/sftnight/actions-runner/_work/root/root/.github/workflows/root-ci-config/build_root.py --buildtype ${{ inputs.buildtype }} --platform ${{ matrix.platform }} --incremental ${{ inputs.incremental }} @@ -190,7 +190,7 @@ jobs: - name: Nightly build if: github.event_name == 'schedule' - run: "cd /Users/sftnight && source /Users/sftnight/py-venv/ROOT-CI/bin/activate && /.github/workflows/root-ci-config/build_root.py + run: "cd /Users/sftnight && source /Users/sftnight/py-venv/ROOT-CI/bin/activate && /Users/sftnight/actions-runner/_work/root/root/.github/workflows/root-ci-config/build_root.py --buildtype Release --platform ${{ matrix.platform }} --incremental false @@ -200,7 +200,7 @@ jobs: - name: Update build cache after push to release branch if: github.event_name == 'push' - run: "cd /Users/sftnight && source /Users/sftnight/py-venv/ROOT-CI/bin/activate && /.github/workflows/root-ci-config/build_root.py + run: "cd /Users/sftnight && source /Users/sftnight/py-venv/ROOT-CI/bin/activate && /Users/sftnight/actions-runner/_work/root/root/.github/workflows/root-ci-config/build_root.py --buildtype RelWithDebInfo --platform ${{ matrix.platform }} --incremental false From 6476be5cea18edc2156fd117e0f83dbd31011c48 Mon Sep 17 00:00:00 2001 From: Nils Langguth Date: Wed, 10 Sep 2025 11:53:12 +0200 Subject: [PATCH 08/12] Update root-ci.yml --- .github/workflows/root-ci.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/root-ci.yml b/.github/workflows/root-ci.yml index f2fe56c37420c..8d1f209b30904 100644 --- a/.github/workflows/root-ci.yml +++ b/.github/workflows/root-ci.yml @@ -159,6 +159,8 @@ jobs: with: build-directory: /Users/sftnight/ROOT-CI/src/ + - name: what am i + run: "whoami && env && echo $0 && echo $SHELL && pwd" - name: Set up curl CA bundle for Davix to work with https run: 'echo SSL_CERT_FILE=/opt/local/share/curl/curl-ca-bundle.crt >> $GITHUB_ENV' - name: Pull Request Build @@ -166,7 +168,7 @@ jobs: env: INCREMENTAL: ${{ !contains(github.event.pull_request.labels.*.name, 'clean build') }} GITHUB_PR_ORIGIN: ${{ github.event.pull_request.head.repo.clone_url }} - run: "cd /Users/sftnight && source /Users/sftnight/py-venv/ROOT-CI/bin/activate && /Users/sftnight/actions-runner/_work/root/root/.github/workflows/root-ci-config/build_root.py + run: "export HOME='/Users/sftnight' && source /Users/sftnight/py-venv/ROOT-CI/bin/activate && .github/workflows/root-ci-config/build_root.py --buildtype RelWithDebInfo --incremental $INCREMENTAL --base_ref ${{ github.base_ref }} @@ -179,7 +181,7 @@ jobs: - name: Workflow dispatch if: ${{ github.event_name == 'workflow_dispatch' && !matrix.is_special }} - run: "cd /Users/sftnight && source /Users/sftnight/py-venv/ROOT-CI/bin/activate && /Users/sftnight/actions-runner/_work/root/root/.github/workflows/root-ci-config/build_root.py + run: "export HOME='/Users/sftnight' && source /Users/sftnight/py-venv/ROOT-CI/bin/activate && .github/workflows/root-ci-config/build_root.py --buildtype ${{ inputs.buildtype }} --platform ${{ matrix.platform }} --incremental ${{ inputs.incremental }} @@ -190,7 +192,7 @@ jobs: - name: Nightly build if: github.event_name == 'schedule' - run: "cd /Users/sftnight && source /Users/sftnight/py-venv/ROOT-CI/bin/activate && /Users/sftnight/actions-runner/_work/root/root/.github/workflows/root-ci-config/build_root.py + run: "export HOME='/Users/sftnight' && source /Users/sftnight/py-venv/ROOT-CI/bin/activate && .github/workflows/root-ci-config/build_root.py --buildtype Release --platform ${{ matrix.platform }} --incremental false @@ -200,7 +202,7 @@ jobs: - name: Update build cache after push to release branch if: github.event_name == 'push' - run: "cd /Users/sftnight && source /Users/sftnight/py-venv/ROOT-CI/bin/activate && /Users/sftnight/actions-runner/_work/root/root/.github/workflows/root-ci-config/build_root.py + run: "export HOME='/Users/sftnight' && source /Users/sftnight/py-venv/ROOT-CI/bin/activate && .github/workflows/root-ci-config/build_root.py --buildtype RelWithDebInfo --platform ${{ matrix.platform }} --incremental false From edd8f7885c8d41eb54990ace1ab1d31785dfb731 Mon Sep 17 00:00:00 2001 From: Nils Langguth Date: Wed, 10 Sep 2025 12:10:36 +0200 Subject: [PATCH 09/12] Update root-ci.yml --- .github/workflows/root-ci.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/root-ci.yml b/.github/workflows/root-ci.yml index 8d1f209b30904..31ee0888f5c5d 100644 --- a/.github/workflows/root-ci.yml +++ b/.github/workflows/root-ci.yml @@ -160,10 +160,12 @@ jobs: build-directory: /Users/sftnight/ROOT-CI/src/ - name: what am i + shell: bash -leo pipefail {0} run: "whoami && env && echo $0 && echo $SHELL && pwd" - name: Set up curl CA bundle for Davix to work with https run: 'echo SSL_CERT_FILE=/opt/local/share/curl/curl-ca-bundle.crt >> $GITHUB_ENV' - name: Pull Request Build + shell: bash -leo pipefail {0} if: github.event_name == 'pull_request' env: INCREMENTAL: ${{ !contains(github.event.pull_request.labels.*.name, 'clean build') }} @@ -180,6 +182,7 @@ jobs: --platform ${{ matrix.platform }}" - name: Workflow dispatch + shell: bash -leo pipefail {0} if: ${{ github.event_name == 'workflow_dispatch' && !matrix.is_special }} run: "export HOME='/Users/sftnight' && source /Users/sftnight/py-venv/ROOT-CI/bin/activate && .github/workflows/root-ci-config/build_root.py --buildtype ${{ inputs.buildtype }} @@ -191,6 +194,7 @@ jobs: --repository ${{ github.server_url }}/${{ github.repository }}" - name: Nightly build + shell: bash -leo pipefail {0} if: github.event_name == 'schedule' run: "export HOME='/Users/sftnight' && source /Users/sftnight/py-venv/ROOT-CI/bin/activate && .github/workflows/root-ci-config/build_root.py --buildtype Release @@ -201,6 +205,7 @@ jobs: --repository ${{ github.server_url }}/${{ github.repository }}" - name: Update build cache after push to release branch + shell: bash -leo pipefail {0} if: github.event_name == 'push' run: "export HOME='/Users/sftnight' && source /Users/sftnight/py-venv/ROOT-CI/bin/activate && .github/workflows/root-ci-config/build_root.py --buildtype RelWithDebInfo From 429699fed74288e928cfea7e588f8f5c178a8a58 Mon Sep 17 00:00:00 2001 From: Nils Langguth Date: Wed, 10 Sep 2025 12:16:57 +0200 Subject: [PATCH 10/12] Update root-ci.yml --- .github/workflows/root-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/root-ci.yml b/.github/workflows/root-ci.yml index 31ee0888f5c5d..7b8e1aa314868 100644 --- a/.github/workflows/root-ci.yml +++ b/.github/workflows/root-ci.yml @@ -161,7 +161,7 @@ jobs: - name: what am i shell: bash -leo pipefail {0} - run: "whoami && env && echo $0 && echo $SHELL && pwd" + run: "env && source /Users/sftnight/py-venv/ROOT-CI/bin/activate && whoami && env && echo $0 && echo $SHELL && pwd && python -m site" - name: Set up curl CA bundle for Davix to work with https run: 'echo SSL_CERT_FILE=/opt/local/share/curl/curl-ca-bundle.crt >> $GITHUB_ENV' - name: Pull Request Build From 57246fa446b42a663bca80c6c4290f91bdcff017 Mon Sep 17 00:00:00 2001 From: Nils Langguth Date: Wed, 10 Sep 2025 13:36:09 +0200 Subject: [PATCH 11/12] Update root-ci.yml --- .github/workflows/root-ci.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/root-ci.yml b/.github/workflows/root-ci.yml index 7b8e1aa314868..fe84661f0545d 100644 --- a/.github/workflows/root-ci.yml +++ b/.github/workflows/root-ci.yml @@ -161,7 +161,7 @@ jobs: - name: what am i shell: bash -leo pipefail {0} - run: "env && source /Users/sftnight/py-venv/ROOT-CI/bin/activate && whoami && env && echo $0 && echo $SHELL && pwd && python -m site" + run: "whoami && env && echo $0 && echo $SHELL && pwd && python3 -m site && which python3 && echo $PATH" - name: Set up curl CA bundle for Davix to work with https run: 'echo SSL_CERT_FILE=/opt/local/share/curl/curl-ca-bundle.crt >> $GITHUB_ENV' - name: Pull Request Build @@ -170,7 +170,7 @@ jobs: env: INCREMENTAL: ${{ !contains(github.event.pull_request.labels.*.name, 'clean build') }} GITHUB_PR_ORIGIN: ${{ github.event.pull_request.head.repo.clone_url }} - run: "export HOME='/Users/sftnight' && source /Users/sftnight/py-venv/ROOT-CI/bin/activate && .github/workflows/root-ci-config/build_root.py + run: "export HOME='/Users/sftnight' && .github/workflows/root-ci-config/build_root.py --buildtype RelWithDebInfo --incremental $INCREMENTAL --base_ref ${{ github.base_ref }} @@ -184,7 +184,7 @@ jobs: - name: Workflow dispatch shell: bash -leo pipefail {0} if: ${{ github.event_name == 'workflow_dispatch' && !matrix.is_special }} - run: "export HOME='/Users/sftnight' && source /Users/sftnight/py-venv/ROOT-CI/bin/activate && .github/workflows/root-ci-config/build_root.py + run: "export HOME='/Users/sftnight' && .github/workflows/root-ci-config/build_root.py --buildtype ${{ inputs.buildtype }} --platform ${{ matrix.platform }} --incremental ${{ inputs.incremental }} @@ -196,7 +196,7 @@ jobs: - name: Nightly build shell: bash -leo pipefail {0} if: github.event_name == 'schedule' - run: "export HOME='/Users/sftnight' && source /Users/sftnight/py-venv/ROOT-CI/bin/activate && .github/workflows/root-ci-config/build_root.py + run: "export HOME='/Users/sftnight' && .github/workflows/root-ci-config/build_root.py --buildtype Release --platform ${{ matrix.platform }} --incremental false @@ -207,7 +207,7 @@ jobs: - name: Update build cache after push to release branch shell: bash -leo pipefail {0} if: github.event_name == 'push' - run: "export HOME='/Users/sftnight' && source /Users/sftnight/py-venv/ROOT-CI/bin/activate && .github/workflows/root-ci-config/build_root.py + run: "export HOME='/Users/sftnight' && .github/workflows/root-ci-config/build_root.py --buildtype RelWithDebInfo --platform ${{ matrix.platform }} --incremental false From fe526c31b45ab453ba2fd304a02378a12532c950 Mon Sep 17 00:00:00 2001 From: Nils Langguth Date: Wed, 10 Sep 2025 14:07:36 +0200 Subject: [PATCH 12/12] Update root-ci.yml --- .github/workflows/root-ci.yml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/.github/workflows/root-ci.yml b/.github/workflows/root-ci.yml index fe84661f0545d..8515ad7493c6b 100644 --- a/.github/workflows/root-ci.yml +++ b/.github/workflows/root-ci.yml @@ -160,6 +160,8 @@ jobs: build-directory: /Users/sftnight/ROOT-CI/src/ - name: what am i + env: + HOME: /Users/sftnight shell: bash -leo pipefail {0} run: "whoami && env && echo $0 && echo $SHELL && pwd && python3 -m site && which python3 && echo $PATH" - name: Set up curl CA bundle for Davix to work with https @@ -168,9 +170,10 @@ jobs: shell: bash -leo pipefail {0} if: github.event_name == 'pull_request' env: + HOME: /Users/sftnight INCREMENTAL: ${{ !contains(github.event.pull_request.labels.*.name, 'clean build') }} GITHUB_PR_ORIGIN: ${{ github.event.pull_request.head.repo.clone_url }} - run: "export HOME='/Users/sftnight' && .github/workflows/root-ci-config/build_root.py + run: ".github/workflows/root-ci-config/build_root.py --buildtype RelWithDebInfo --incremental $INCREMENTAL --base_ref ${{ github.base_ref }} @@ -184,7 +187,7 @@ jobs: - name: Workflow dispatch shell: bash -leo pipefail {0} if: ${{ github.event_name == 'workflow_dispatch' && !matrix.is_special }} - run: "export HOME='/Users/sftnight' && .github/workflows/root-ci-config/build_root.py + run: ".github/workflows/root-ci-config/build_root.py --buildtype ${{ inputs.buildtype }} --platform ${{ matrix.platform }} --incremental ${{ inputs.incremental }} @@ -196,7 +199,7 @@ jobs: - name: Nightly build shell: bash -leo pipefail {0} if: github.event_name == 'schedule' - run: "export HOME='/Users/sftnight' && .github/workflows/root-ci-config/build_root.py + run: ".github/workflows/root-ci-config/build_root.py --buildtype Release --platform ${{ matrix.platform }} --incremental false @@ -207,7 +210,7 @@ jobs: - name: Update build cache after push to release branch shell: bash -leo pipefail {0} if: github.event_name == 'push' - run: "export HOME='/Users/sftnight' && .github/workflows/root-ci-config/build_root.py + run: ".github/workflows/root-ci-config/build_root.py --buildtype RelWithDebInfo --platform ${{ matrix.platform }} --incremental false