Skip to content

Commit

Permalink
[CI] Unpin Jasmin
Browse files Browse the repository at this point in the history
Now that jasmin-lang/jasmin#560 is merged
  • Loading branch information
proux01 committed Jul 31, 2024
1 parent 97c4a7b commit 2a20f96
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 9 deletions.
4 changes: 2 additions & 2 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -861,14 +861,14 @@ library:ci-mathcomp_word:
extends: .ci-template-flambda
needs:
- build:edge+flambda
- library:ci-mathcomp_1
- library:ci-mathcomp
stage: build-2

library:ci-jasmin:
extends: .ci-template-flambda
needs:
- build:edge+flambda
- library:ci-mathcomp_1
- library:ci-mathcomp
- library:ci-mathcomp_word
stage: build-3+

Expand Down
2 changes: 1 addition & 1 deletion Makefile.ci
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ ci-oddorder: ci-mathcomp
ci-fcsl_pcm: ci-mathcomp_1
ci-mczify: ci-mathcomp
ci-mathcomp_test: ci-mathcomp
ci-mathcomp_word: ci-mathcomp_1
ci-mathcomp_word: ci-mathcomp
ci-finmap: ci-mathcomp
ci-bigenough: ci-mathcomp
ci-analysis: ci-elpi_hb ci-finmap ci-bigenough
Expand Down
8 changes: 2 additions & 6 deletions dev/ci/ci-basic-overlay.sh
Original file line number Diff line number Diff line change
Expand Up @@ -492,18 +492,14 @@ project itauto "https://gitlab.inria.fr/fbesson/itauto" "master"
########################################################################
# Mathcomp-word
########################################################################
project mathcomp_word "https://github.com/jasmin-lang/coqword" "v2.2"
project mathcomp_word "https://github.com/jasmin-lang/coqword" "main"
# Contact @vbgl, @strub on github
# go back to "main" and change dependency to MC 2 when
# https://github.com/jasmin-lang/jasmin/pull/560 is merged

########################################################################
# Jasmin
########################################################################
project jasmin "https://github.com/jasmin-lang/jasmin" "e8380c779b5c284c6d4c654d4ea86c56521a6d4c"
project jasmin "https://github.com/jasmin-lang/jasmin" "main"
# Contact @vbgl, @bgregoir on github
# go back to "main" and change dependency to MC 2 when
# https://github.com/jasmin-lang/jasmin/pull/560 is merged

########################################################################
# Lean Importer
Expand Down
1 change: 1 addition & 0 deletions dev/ci/user-overlays/19432-proux01-unpin-jasmin.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
overlay jasmin https://github.com/proux01/jasmin coq_master 19432

0 comments on commit 2a20f96

Please sign in to comment.