From 4c95cb7068563b329af01ed837b89ddb78d67c3a Mon Sep 17 00:00:00 2001 From: Brice Videau Date: Mon, 22 Jul 2024 17:55:13 -0500 Subject: [PATCH 1/2] Update presubmit.yml Fix ruby build on ARM: https://github.com/openwrt/packages/issues/24450 --- .github/workflows/presubmit.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/presubmit.yml b/.github/workflows/presubmit.yml index 78e595d..df889ac 100644 --- a/.github/workflows/presubmit.yml +++ b/.github/workflows/presubmit.yml @@ -18,28 +18,28 @@ jobs: run: | . external/spack/share/spack/setup-env.sh spack repo add ./ - spack install thapi + spack install thapi ^ruby@3.1.0 - name: Install thapi v0.0.7 run: | . external/spack/share/spack/setup-env.sh - spack install thapi@0.0.7 + spack install thapi@0.0.7 ^ruby@3.1.0 - name: Install thapi v0.0.8 run: | . external/spack/share/spack/setup-env.sh - spack install thapi@0.0.8 - - name: Install thapi v0.0.9 + spack install thapi@0.0.8 ^ruby@3.1.0 + - name: Install thapi v0.0.9 run: | . external/spack/share/spack/setup-env.sh - spack install thapi@0.0.9 + spack install thapi@0.0.9 ^ruby@3.1.0 - name: Install thapi v0.0.10 run: | . external/spack/share/spack/setup-env.sh - spack install thapi@0.0.10 + spack install thapi@0.0.10 ^ruby@3.1.0 - name: Install thapi v0.0.11 run: | . external/spack/share/spack/setup-env.sh - spack install thapi@0.0.11 + spack install thapi@0.0.11 ^ruby@3.1.0 - name: Install thapi master run: | . external/spack/share/spack/setup-env.sh - spack install thapi@master ^lttng-tools@master ^lttng-ust@master ^babeltrace2@master + spack install thapi@master ^lttng-tools@master ^lttng-ust@master ^babeltrace2@master ^ruby@3.1.0 From ea4c6edd06afc76b86a3cb418fa065e3e424e61c Mon Sep 17 00:00:00 2001 From: Brice Videau Date: Wed, 24 Jul 2024 16:12:34 -0500 Subject: [PATCH 2/2] Update .github/workflows/presubmit.yml --- .github/workflows/presubmit.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/presubmit.yml b/.github/workflows/presubmit.yml index df889ac..cf46102 100644 --- a/.github/workflows/presubmit.yml +++ b/.github/workflows/presubmit.yml @@ -27,7 +27,7 @@ jobs: run: | . external/spack/share/spack/setup-env.sh spack install thapi@0.0.8 ^ruby@3.1.0 - - name: Install thapi v0.0.9 + - name: Install thapi v0.0.9 run: | . external/spack/share/spack/setup-env.sh spack install thapi@0.0.9 ^ruby@3.1.0