Skip to content

Temporarily pin tar-unix #85

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

Closed
dra27 wants to merge 4 commits into from
Closed

Temporarily pin tar-unix #85

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f6ea904
Temporarily pin tar-unix
dra27 Nov 4, 2021
97de4d7
Disable zfs stress test
dra27 Nov 4, 2021
763afef
Allow network access when pinning
dra27 Nov 4, 2021
bfabf56
Wind opam-repo forwards
dra27 Nov 4, 2021
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 .run-gha-tests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ opam exec -- make
opam exec -- dune exec -- obuilder healthcheck --store=btrfs:/btrfs
opam exec -- dune exec -- obuilder healthcheck --store=zfs:zfs
opam exec -- dune exec -- ./stress/stress.exe btrfs:/btrfs
opam exec -- dune exec -- ./stress/stress.exe zfs:zfs
#opam exec -- dune exec -- ./stress/stress.exe zfs:zfs

# Populate the caches from our own GitHub Actions cache
btrfs subvolume create /btrfs/cache/c-opam-archives
Expand Down
4 changes: 2 additions & 2 deletions example.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
(workdir /src)
(user (uid 1000) (gid 1000)) ; Build as the "opam" user
(run (shell "sudo chown opam /src"))
(env OPAM_HASH "3332c004db65ef784f67efdadc50982f000b718f") ; Fix the version of opam-repository we want
(env OPAM_HASH "2018971bc97a8384b46aae43f3b2e9ccbc20ac32") ; Fix the version of opam-repository we want
(run
(network host)
(shell "sudo apt-get --allow-releaseinfo-change update"))
Expand All @@ -25,7 +25,7 @@
&& opam update -u"))
; Copy just the opam file first (helps caching)
(copy (src obuilder-spec.opam obuilder.opam) (dst ./))
(run (shell "opam pin add -yn ."))
(run (network host) (shell "opam pin add -yn ."))
; Install OS package dependencies
(run
(network host)
Expand Down
4 changes: 4 additions & 0 deletions obuilder.opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,3 +42,7 @@ build: [
]
]
dev-repo: "git+https://github.com/ocurrent/obuilder.git"
pin-depends: [
[ "tar-unix.dev" "git+https://github.com/dra27/ocaml-tar.git#6cce2e2206140b2e63e6b217d5bc51b1200a76d0"]
[ "tar.dev" "git+https://github.com/dra27/ocaml-tar.git#6cce2e2206140b2e63e6b217d5bc51b1200a76d0"]
]
4 changes: 4 additions & 0 deletions obuilder.opam.template
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
pin-depends: [
[ "tar-unix.dev" "git+https://github.com/dra27/ocaml-tar.git#6cce2e2206140b2e63e6b217d5bc51b1200a76d0"]
[ "tar.dev" "git+https://github.com/dra27/ocaml-tar.git#6cce2e2206140b2e63e6b217d5bc51b1200a76d0"]
]