Skip to content
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.

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

Update Gobra to the newest Viper version #499

Merged
merged 23 commits into from
Sep 1, 2022
Merged

Update Gobra to the newest Viper version #499

merged 23 commits into from
Sep 1, 2022

Conversation

jcp19
Copy link
Contributor

@jcp19 jcp19 commented Aug 5, 2022

This PR updates Gobra to use the latest changes as of today (01.09.2022). Initially, it was meant to update Gobra to use the viper version from the 22.07 release, but instead it uses a more recent version than that due to nice-to-have changes made recently (in particular, viperproject/silver#604).

Furthermore, in this PR, I removed ViperChopper - instead, we now use Chopper provided by silver. Furthermore, I changed Gobra to use submodules, which makes the process of upgrading and installing Gobra a lot easier! Thanks @ArquintL for changing viperserver to use modules.

@jcp19 jcp19 marked this pull request as draft August 5, 2022 13:15
@ArquintL
Copy link
Member

@jcp19 ViperServer (i.e. the master branch) is now using submodules. It should thus be sufficient to only have ViperServer as submodule

README.md Outdated Show resolved Hide resolved
src/test/scala/viper/gobra/chopper/SCCUnitTests.scala Outdated Show resolved Hide resolved
@jcp19 jcp19 changed the title Update Gobra to the new Viper release (v22.07) Update Gobra to the newest Viper version Sep 1, 2022
@jcp19 jcp19 marked this pull request as ready for review September 1, 2022 08:14
Copy link
Contributor

@Felalolf Felalolf left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am not sure it is the best idea to make Viper Server determine which Silicon, Carbon, and Silver version Gobra uses. That said, I guess we can still pick individual Silicon, Carbon, Silver versions by creating a ViperServer branch with the set of depencies that we want.

README.md Outdated Show resolved Hide resolved
Copy link
Member

@ArquintL ArquintL left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please remove the following entries from .gitignore:

carbon
silver
silicon
viperserver

build.sbt Show resolved Hide resolved
@ArquintL
Copy link
Member

ArquintL commented Sep 1, 2022

I am not sure it is the best idea to make Viper Server determine which Silicon, Carbon, and Silver version Gobra uses. That said, I guess we can still pick individual Silicon, Carbon, Silver versions by creating a ViperServer branch with the set of depencies that we want.

I think it's good that ViperServer determines the dependent commits since this is tested & guaranteed to work. We'll typically either use a Viper release (with fixed commits for ViperServer, Carbon, Silicon, and Silver) or a nightly release of ViperServer. In the latter case, the current master version of Carbon & Silicon is used & tested (while updating the corresponding submodules)

@jcp19 jcp19 merged commit 139e159 into master Sep 1, 2022
@jcp19 jcp19 deleted the viper-22.07 branch September 1, 2022 11:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants