Skip to content

GHA: Ensure a better availability of the micro_httpd dependency #7033

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
kit-ty-kate wants to merge 1 commit into
base: master
Choose a base branch
from
+14 −6
Draft

GHA: Ensure a better availability of the micro_httpd dependency #7033

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/scripts/main/preamble.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ EOF
fi

if [ "$OPAM_TEST" = "1" ]; then
opam pin git+https://codeberg.org/kit-ty-kate/micro_httpd
opam install micro_httpd
fi

rm -f "$OPAMBSROOT"/log/*
Expand Down
9 changes: 8 additions & 1 deletion .github/scripts/main/reftests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,14 @@ esac

export PATH="$PREFIX/bin:$PATH"

git clone https://codeberg.org/kit-ty-kate/micro_httpd
# Fetch micro_httpd
export OPAMROOT=$(pwd)/tmp-opamroot
opam init -n --bypass-checks --bare "git+$OPAM_REPO_MAIN#$OPAM_REPO_SHA"
opam source --no-switch --dir=micro_httpd micro_httpd
rm -rf "$OPAMROOT"
unset OPAMROOT

# Build micro_httpd
pushd micro_httpd
dune build -p micro_httpd
dune install --root . --prefix "$CONFIGURE_PREFIX"
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -551,8 +551,8 @@ let main oc : unit =
("OPAMBSROOT", "~/.cache/.opam.cached");
("OPAM12CACHE", "~/.cache/opam1.2/cache");
("OPAM_REPO", "https://github.com/ocaml/opam-repository.git");
("OPAM_TEST_REPO_SHA", "ceed23f9d33677f323a62325ad42599d14f46b98");
("OPAM_REPO_SHA", "ceed23f9d33677f323a62325ad42599d14f46b98");
("OPAM_TEST_REPO_SHA", "e1203ec1b376758dce6b8a976ab672afb8c9252f");
("OPAM_REPO_SHA", "e1203ec1b376758dce6b8a976ab672afb8c9252f");
("SOLVER", "");
(* Cygwin configuration *)
("CYGWIN_MIRROR", "http://mirrors.kernel.org/sourceware/cygwin/");
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ env:
OPAMBSROOT: ~/.cache/.opam.cached
OPAM12CACHE: ~/.cache/opam1.2/cache
OPAM_REPO: https://github.com/ocaml/opam-repository.git
OPAM_TEST_REPO_SHA: ceed23f9d33677f323a62325ad42599d14f46b98
OPAM_REPO_SHA: ceed23f9d33677f323a62325ad42599d14f46b98
OPAM_TEST_REPO_SHA: e1203ec1b376758dce6b8a976ab672afb8c9252f
OPAM_REPO_SHA: e1203ec1b376758dce6b8a976ab672afb8c9252f
SOLVER:
CYGWIN_MIRROR: http://mirrors.kernel.org/sourceware/cygwin/
CYGWIN_ROOT: D:\cygwin
Expand Down
1 change: 1 addition & 0 deletions master_changes.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,6 +246,7 @@ users)
* Upgrade the CI to OCaml 5.5 and 4.14.4 [#6988 @kit-ty-kate]
* Fix the Cygwin 5.5 build by requiring cygwin gcc 13.4 as 14.4 breaks C++ support [#7007 @kit-ty-kate]
* Upgrade to use opam 2.5.2 [#7018 @kit-ty-kate]
* Ensure a better availability of the `micro_httpd` dependency [#7033 @kit-ty-kate]

## Doc
* Update the packaging page to recommend using static archives for releases [#6973 @mseri]
Expand Down
Loading