Skip to content

GHA: Make the reftests pass with the macos GHA runner-images >= 20250928#6719

Merged
rjbou merged 1 commit intoocaml:masterfrom
kit-ty-kate:gha-fix-macos-runner-20250928
Oct 6, 2025
Merged

GHA: Make the reftests pass with the macos GHA runner-images >= 20250928#6719
rjbou merged 1 commit intoocaml:masterfrom
kit-ty-kate:gha-fix-macos-runner-20250928

Conversation

@kit-ty-kate
Copy link
Copy Markdown
Member

@kit-ty-kate kit-ty-kate commented Oct 3, 2025

Noticed in #6709

diff --git a/_build/default/tests/reftests/env.test b/_build/default/tests/reftests/env.out
index 981afd3..1bbb7e0 100644
--- a/_build/default/tests/reftests/env.test
+++ b/_build/default/tests/reftests/env.out
@@ -609,6 +609,7 @@ OPAMSWITCH=bd
 OPAM_PACKAGE_NAME=to-build
 OPAM_PACKAGE_VERSION=2
 OPAM_SWITCH_PREFIX=${BASEDIR}/OPAM/bd
+__CF_USER_TEXT_ENCODING=0x1F5:0x0:0x0
 PATH=${BASEDIR}/OPAM/bd/bin
 ### opam remove to-build
 The following actions will be performed:
@@ -650,4 +651,5 @@ OPAMSWITCH=bd
 OPAM_PACKAGE_NAME=another-package
 OPAM_PACKAGE_VERSION=another-version
 OPAM_SWITCH_PREFIX=${BASEDIR}/OPAM/bd
+__CF_USER_TEXT_ENCODING=0x1F5:0x0:0x0
 PATH=${BASEDIR}/OPAM/bd/bin:another-path

Tested successfully in https://github.com/kit-ty-kate/opam/actions/runs/18236297859/job/51930560271?pr=22

@kit-ty-kate kit-ty-kate added this to the 2.5.0~alpha1 milestone Oct 3, 2025
@kit-ty-kate kit-ty-kate requested a review from rjbou October 3, 2025 21:14
@kit-ty-kate kit-ty-kate force-pushed the gha-fix-macos-runner-20250928 branch from 559b80a to 04a8e6e Compare October 3, 2025 21:14
@rjbou rjbou merged commit e8d390d into ocaml:master Oct 6, 2025
45 checks passed
@kit-ty-kate kit-ty-kate deleted the gha-fix-macos-runner-20250928 branch October 6, 2025 13:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants