Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: rjbou/opam
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 7904435c6d0adf5bf31d1dc7827bf271f3d54a45
Choose a base ref
..
head repository: rjbou/opam
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 5f5cd9e7b4466bd7fd69f2ce3edd00cc2911091a
Choose a head ref
Showing with 16 additions and 5 deletions.
  1. +3 −0 .github/scripts/main.sh
  2. +5 −0 .github/scripts/preamble.sh
  3. +6 −5 .github/workflows/main.yml
  4. +2 −0 master_changes.md
3 changes: 3 additions & 0 deletions .github/scripts/main.sh
View file
Original file line number Diff line number Diff line change
@@ -150,6 +150,9 @@ fi
# to be moved forwards when a new version of OCaml is added to ensure that the
# ocaml-system package is available at the correct version.
opam init --bare default git+$OPAM_REPO#$OPAM_TEST_REPO_SHA
cat >> $(opam var root --global 2>/dev/null)/config <<EOF
archive-mirrors: "https://opam.ocaml.org/cache"
EOF
opam switch create default ocaml-system
eval $(opam env)
opam install lwt
5 changes: 5 additions & 0 deletions .github/scripts/preamble.sh
View file
Original file line number Diff line number Diff line change
@@ -41,6 +41,11 @@ init-bootstrap () {
export OPAMROOT=$OPAMBSROOT
# The system compiler will be picked up
opam init --no-setup git+$OPAM_REPO#$OPAM_REPO_SHA

cat >> $OPAMROOT/config <<EOF
archive-mirrors: "https://opam.ocaml.org/cache"
EOF

eval $(opam env)
# opam update
CURRENT_SWITCH=$(opam var switch)
11 changes: 6 additions & 5 deletions .github/workflows/main.yml
View file
Original file line number Diff line number Diff line change
@@ -43,7 +43,7 @@ env:
OPAM_TEST_REPO_SHA: 765662297a24d833c6a04752cd8b89c5bd72fe26
OPAM_REPO_SHA: 765662297a24d833c6a04752cd8b89c5bd72fe26
# Default ocaml version for some jobs
OCAML_VERSION: 4.11.2
OCAML_VERSION: 4.12.0
## variables for cache paths
GH_OCAML_CACHE: ~/.cache/ocaml-local/**
SOLVER:
@@ -141,6 +141,7 @@ jobs:
# Legacy
####
legacy:
needs: [ build ]
runs-on: ubuntu-latest
strategy:
matrix:
@@ -179,7 +180,7 @@ jobs:
strategy:
matrix:
os: [ ubuntu-latest, macos-latest ]
ocamlv: [ 4.11.2 ]
ocamlv: [ 4.12.0 ]
fail-fast: false
env:
OPAM_TEST: 1
@@ -231,7 +232,7 @@ jobs:
matrix:
# os: [ ubuntu-latest, macos-latest ]
os: [ ubuntu-latest ]
ocamlv: [ 4.11.2 ]
ocamlv: [ 4.12.0 ]
fail-fast: false
steps:
- name: install deps
@@ -261,7 +262,7 @@ jobs:
strategy:
matrix:
os: [ ubuntu-latest, macos-latest ]
ocamlv: [ 4.11.2 ]
ocamlv: [ 4.12.0 ]
solver: [ z3, 0install ]
fail-fast: false
env:
@@ -310,7 +311,7 @@ jobs:
strategy:
matrix:
os: [ ubuntu-latest, macos-latest ]
ocamlv: [ 4.11.2 ]
ocamlv: [ 4.12.0 ]
fail-fast: false
steps:
- name: install deps
2 changes: 2 additions & 0 deletions master_changes.md
View file
Original file line number Diff line number Diff line change
@@ -147,6 +147,8 @@ users)
* Specify whitelist of changed files to launch workflow [#473 @rjbou]
* Update changelog checker list [#4773 @rjbou]
* Launch main hygiene job on configure/src_ext changes [#4773 @rjbou]
* Add opam.ocaml.org cache to reach disappearing archive [#4865 @rjbou]
* Update ocaml version frm 4.11.2 to 4.12.0 (because of macos failure) [#4865 @rjbou]
* Add a depext checkup, launched only is `OpamSysInteract` is changed [#4788 @rjbou]

## Shell