Skip to content

Commit 4ca8df9

Browse files
authored
Merge pull request #1522 from goblint/opam-locked
Upgrade locked opam dependencies
2 parents 17cb66e + a323664 commit 4ca8df9

File tree

8 files changed

+68
-55
lines changed

8 files changed

+68
-55
lines changed

.github/workflows/coverage.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
os:
1919
- ubuntu-latest
2020
ocaml-compiler:
21-
- ocaml-variants.4.14.0+options,ocaml-option-flambda # matches opam lock file
21+
- ocaml-variants.4.14.2+options,ocaml-option-flambda # matches opam lock file
2222
# don't add any other because they won't be used
2323

2424
runs-on: ${{ matrix.os }}

.github/workflows/docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
os:
1919
- ubuntu-latest
2020
ocaml-compiler:
21-
- ocaml-variants.4.14.0+options,ocaml-option-flambda # matches opam lock file
21+
- ocaml-variants.4.14.2+options,ocaml-option-flambda # matches opam lock file
2222
# don't add any other because they won't be used
2323

2424
runs-on: ${{ matrix.os }}

.github/workflows/locked.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
- ubuntu-latest
2121
- macos-13
2222
ocaml-compiler:
23-
- ocaml-variants.4.14.0+options,ocaml-option-flambda # matches opam lock file
23+
- ocaml-variants.4.14.2+options,ocaml-option-flambda # matches opam lock file
2424
# don't add any other because they won't be used
2525

2626
runs-on: ${{ matrix.os }}
@@ -72,7 +72,7 @@ jobs:
7272
os:
7373
- ubuntu-latest
7474
ocaml-compiler:
75-
- ocaml-variants.4.14.0+options,ocaml-option-flambda # matches opam lock file
75+
- ocaml-variants.4.14.2+options,ocaml-option-flambda # matches opam lock file
7676
# don't add any other because they won't be used
7777

7878
runs-on: ${{ matrix.os }}
@@ -114,7 +114,7 @@ jobs:
114114
os:
115115
- ubuntu-latest
116116
ocaml-compiler:
117-
- ocaml-variants.4.14.0+options,ocaml-option-flambda # matches opam lock file
117+
- ocaml-variants.4.14.2+options,ocaml-option-flambda # matches opam lock file
118118
# don't add any other because they won't be used
119119
node-version:
120120
- 14

.github/workflows/unlocked.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
- 5.2.x
2222
- 5.1.x
2323
- 5.0.x
24-
- ocaml-variants.4.14.0+options,ocaml-option-flambda
24+
- ocaml-variants.4.14.2+options,ocaml-option-flambda
2525
- 4.14.x
2626
apron:
2727
- false
@@ -91,7 +91,7 @@ jobs:
9191
- ubuntu-latest
9292
- macos-13
9393
ocaml-compiler:
94-
- ocaml-variants.4.14.0+options,ocaml-option-flambda # matches opam lock file, downgrade deps step
94+
- ocaml-variants.4.14.2+options,ocaml-option-flambda # matches opam lock file, downgrade deps step
9595

9696
name: lower-bounds (${{ matrix.os }}, ${{ matrix.ocaml-compiler }}, downgrade)
9797

@@ -131,7 +131,7 @@ jobs:
131131
- name: Downgrade dependencies
132132
# must specify ocaml-base-compiler again to prevent it from being downgraded
133133
# prevent num downgrade to avoid dune/jbuilder error: https://github.com/ocaml/dune/issues/5280
134-
run: opam install $(opam exec -- opam-0install --prefer-oldest goblint ocaml-variants.4.14.0+options ocaml-option-flambda num.1.5)
134+
run: opam install $(opam exec -- opam-0install --prefer-oldest goblint ocaml-variants.4.14.2+options ocaml-option-flambda num.1.5)
135135

136136
- name: Build
137137
run: ./make.sh nat
@@ -188,7 +188,7 @@ jobs:
188188
- ubuntu-latest
189189
- macos-13
190190
ocaml-compiler:
191-
- ocaml-variants.4.14.0+options,ocaml-option-flambda # matches opam lock file
191+
- ocaml-variants.4.14.2+options,ocaml-option-flambda # matches opam lock file
192192

193193
runs-on: ${{ matrix.os }}
194194

goblint.opam.locked

Lines changed: 49 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -22,89 +22,94 @@ homepage: "https://goblint.in.tum.de"
2222
doc: "https://goblint.readthedocs.io/en/latest/"
2323
bug-reports: "https://github.com/goblint/analyzer/issues"
2424
depends: [
25-
"angstrom" {= "0.15.0"}
25+
"angstrom" {= "0.16.0"}
2626
"apron" {= "v0.9.15"}
2727
"arg-complete" {= "0.1.0"}
2828
"astring" {= "0.8.5"}
2929
"base-bigarray" {= "base"}
3030
"base-bytes" {= "base"}
3131
"base-threads" {= "base"}
3232
"base-unix" {= "base"}
33-
"batteries" {= "3.6.0"}
33+
"batteries" {= "3.8.0"}
3434
"benchmark" {= "1.6" & with-test}
3535
"bigarray-compat" {= "1.1.0"}
36-
"bigstringaf" {= "0.9.0"}
36+
"bigstringaf" {= "0.9.1"}
3737
"bos" {= "0.2.1"}
38-
"camlidl" {= "1.11"}
38+
"camlidl" {= "1.12"}
3939
"camlp-streams" {= "5.0.1"}
4040
"catapult" {= "0.2"}
4141
"catapult-file" {= "0.2"}
42-
"cmdliner" {= "1.1.1" & with-doc}
43-
"conf-autoconf" {= "0.1"}
42+
"cmdliner" {= "1.3.0" & with-doc}
43+
"conf-autoconf" {= "0.2"}
44+
"conf-findutils" {= "1"}
4445
"conf-gcc" {= "1.0"}
4546
"conf-gmp" {= "4"}
46-
"conf-mpfr" {= "3"}
47+
"conf-gmp-paths" {= "1"}
48+
"conf-mpfr-paths" {= "1"}
4749
"conf-perl" {= "2"}
48-
"conf-pkg-config" {= "2"}
4950
"conf-ruby" {= "1.0.0" & with-test}
50-
"conf-which" {= "1"}
5151
"cppo" {= "1.6.9"}
5252
"cpu" {= "2.0.0"}
53-
"csexp" {= "1.5.1"}
54-
"ctypes" {= "0.20.1"}
55-
"dune" {= "3.7.1"}
56-
"dune-build-info" {= "3.7.1"}
57-
"dune-configurator" {= "3.7.1"}
58-
"dune-private-libs" {= "3.7.1"}
59-
"dune-site" {= "3.7.1"}
60-
"dyn" {= "3.7.1"}
53+
"crunch" {= "3.3.1" & with-doc}
54+
"csexp" {= "1.5.2"}
55+
"cstruct" {= "6.2.0"}
56+
"ctypes" {= "0.22.0"}
57+
"dune" {= "3.16.0"}
58+
"dune-build-info" {= "3.16.0"}
59+
"dune-configurator" {= "3.16.0"}
60+
"dune-private-libs" {= "3.16.0"}
61+
"dune-site" {= "3.16.0"}
62+
"dyn" {= "3.16.0"}
63+
"ez-conf-lib" {= "2"}
6164
"fileutils" {= "0.6.4"}
6265
"fmt" {= "0.9.0"}
6366
"fpath" {= "0.7.3"}
6467
"goblint-cil" {= "2.0.3"}
68+
"hex" {= "1.5.0"}
6569
"integers" {= "0.7.0"}
66-
"json-data-encoding" {= "0.12.1"}
67-
"jsonrpc" {= "1.15.0~5.0preview1"}
70+
"json-data-encoding" {= "1.0.1"}
71+
"jsonrpc" {= "1.17.0"}
6872
"logs" {= "0.7.0"}
69-
"mlgmpidl" {= "1.2.15"}
70-
"num" {= "1.4"}
71-
"ocaml" {= "4.14.0"}
73+
"mlgmpidl" {= "1.3.0"}
74+
"num" {= "1.5"}
75+
"ocaml" {= "4.14.2"}
7276
"ocaml-compiler-libs" {= "v0.12.4"}
7377
"ocaml-config" {= "2"}
7478
"ocaml-option-flambda" {= "1"}
7579
"ocaml-syntax-shims" {= "1.0.0"}
76-
"ocaml-variants" {= "4.14.0+options"}
77-
"ocamlbuild" {= "0.14.2"}
78-
"ocamlfind" {= "1.9.5"}
79-
"odoc" {= "2.2.0" & with-doc}
80-
"odoc-parser" {= "2.0.0" & with-doc}
81-
"ordering" {= "3.7.1"}
82-
"ounit2" {= "2.2.6" & with-test}
83-
"pp" {= "1.1.2"}
80+
"ocaml-variants" {= "4.14.2+options"}
81+
"ocamlbuild" {= "0.14.3"}
82+
"ocamlfind" {= "1.9.6"}
83+
"odoc" {= "2.4.2" & with-doc}
84+
"odoc-parser" {= "2.4.2" & with-doc}
85+
"ordering" {= "3.16.0"}
86+
"ounit2" {= "2.2.7" & with-test}
87+
"pp" {= "1.2.0"}
8488
"ppx_derivers" {= "1.2.1"}
8589
"ppx_deriving" {= "6.0.2"}
8690
"ppx_deriving_hash" {= "0.1.2"}
87-
"ppx_deriving_yojson" {= "3.7.0"}
91+
"ppx_deriving_yojson" {= "3.8.0"}
8892
"ppxlib" {= "0.32.1"}
89-
"qcheck-core" {= "0.20"}
90-
"qcheck-ounit" {= "0.20" & with-test}
91-
"re" {= "1.10.4" & with-doc}
92-
"result" {= "1.5"}
93+
"ptime" {= "1.1.0" & with-doc}
94+
"qcheck-core" {= "0.21.3"}
95+
"qcheck-ounit" {= "0.21.3" & with-test}
96+
"re" {= "1.11.0" & with-doc}
97+
"result" {= "1.5" & with-doc}
9398
"rresult" {= "0.7.0"}
9499
"seq" {= "base"}
95-
"sexplib0" {= "v0.15.1"}
96-
"sha" {= "1.15.2"}
100+
"sexplib0" {= "v0.16.0"}
101+
"sha" {= "1.15.4"}
97102
"stdlib-shims" {= "0.3.0"}
98-
"stdune" {= "3.7.1"}
103+
"stdune" {= "3.16.0"}
99104
"stringext" {= "1.6.0"}
100-
"topkg" {= "1.0.6"}
101-
"tyxml" {= "4.5.0" & with-doc}
102-
"uri" {= "4.2.0"}
105+
"topkg" {= "1.0.7"}
106+
"tyxml" {= "4.6.0" & with-doc}
107+
"uri" {= "4.4.0"}
103108
"uuidm" {= "0.9.8"}
104109
"uutf" {= "1.0.3" & with-doc}
105-
"yaml" {= "3.1.0"}
106-
"yojson" {= "2.0.2"}
107-
"zarith" {= "1.12"}
110+
"yaml" {= "3.2.0"}
111+
"yojson" {= "2.2.1"}
112+
"zarith" {= "1.13"}
108113
]
109114
build: [
110115
["dune" "subst"] {dev}

make.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ opam_setup() {
88
set -x
99
opam init -y -a --bare $SANDBOXING # sandboxing is disabled in travis and docker
1010
opam update
11-
opam switch -y create . --deps-only --packages=ocaml-variants.4.14.0+options,ocaml-option-flambda --locked
11+
opam switch -y create . --deps-only --packages=ocaml-variants.4.14.2+options,ocaml-option-flambda --locked
1212
}
1313

1414
rule() {

scripts/test-gobview.py

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
from webdriver_manager.chrome import ChromeDriverManager
77
from selenium.webdriver.common.by import By
88
from selenium.webdriver.chrome.options import Options
9+
from selenium.webdriver.common.desired_capabilities import DesiredCapabilities
910
from threading import Thread
1011
import subprocess
1112

@@ -17,6 +18,11 @@
1718
# cleanup
1819
def cleanup(browser, thread):
1920
print("cleanup")
21+
22+
# print messages
23+
for entry in browser.get_log('browser'):
24+
print(entry)
25+
2026
browser.close()
2127
p.kill()
2228
thread.join()
@@ -35,6 +41,8 @@ def serve():
3541
print("starting installation of browser\n")
3642
options = Options()
3743
options.add_argument('headless')
44+
# options.set_capability("loggingPrefs", { 'browser':'ALL' })
45+
options.set_capability("goog:loggingPrefs", { 'browser':'ALL' })
3846
browser = webdriver.Chrome(service=Service(ChromeDriverManager().install()),options=options)
3947
print("finished webdriver installation \n")
4048
browser.maximize_window()

0 commit comments

Comments
 (0)