Skip to content

Commit

Permalink
TEMP: ci: point to F* and karamel dev branches
Browse files Browse the repository at this point in the history
  • Loading branch information
mtzguido committed Jan 8, 2025
1 parent f0e330b commit 5395597
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions .docker/build/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
"BaseContainerIsEverestImage" : true,
"BaseContainerImageName" : "fstar",
"BaseContainerImageTagOrCommitId": "latest",
"BranchName" : "master",
"GithubCommitUrl" : "https://github.com/FStarLang/FStar/commit",
"BranchName" : "dev",
"GithubCommitUrl" : "https://github.com/mtzguido/FStar/commit",
"OnDemandBuildDefinition" : "FStar\\FStar-{agentOS}",

"DockerFile": ".docker/build/{agentOS}/Dockerfile",
Expand All @@ -29,6 +29,6 @@

"RepoVersions" : {
"mitls_version" : "origin/dev",
"karamel_version" : "origin/master"
"karamel_version" : "origin/dev"
}
}
2 changes: 1 addition & 1 deletion .docker/build/install-deps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ FSTAR_BRANCH=$(jq -c -r '.BranchName' "$build_home"/config.json)

# Install F* (NB: FSTAR_DIR is just where to install F*)
[[ -n "$FSTAR_DIR" ]]
git clone --branch $FSTAR_BRANCH https://github.com/FStarLang/FStar "$FSTAR_DIR"
git clone --branch $FSTAR_BRANCH https://github.com/mtzguido/FStar "$FSTAR_DIR"
opam install --deps-only "$FSTAR_DIR/fstar.opam"
OTHERFLAGS='--admit_smt_queries true' make -j 24 -C "$FSTAR_DIR"

Expand Down
2 changes: 1 addition & 1 deletion .docker/build/install-other-deps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ KRML_BRANCH=$(jq -c -r '.RepoVersions.karamel_version' "$build_home"/config.json

# Install Karamel and its dependencies
[[ -n "$KRML_HOME" ]]
git clone --branch $KRML_BRANCH https://github.com/FStarLang/karamel "$KRML_HOME"
git clone --branch $KRML_BRANCH https://github.com/mtzguido/karamel "$KRML_HOME"
pushd $KRML_HOME
.docker/build/install-other-deps.sh
popd
Expand Down

0 comments on commit 5395597

Please sign in to comment.