Skip to content

Commit

Permalink
Merges branch 'master' into 'meilers_fix_903'
Browse files Browse the repository at this point in the history
  • Loading branch information
ArquintL committed Mar 4, 2025
2 parents ab30187 + 57f315e commit 4536a88
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 10 deletions.
12 changes: 12 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
version: 2

updates:
- package-ecosystem: github-actions
directory: "/"
schedule:
interval: monthly
day: monday
groups:
all:
patterns:
- "*"
10 changes: 5 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:

# Checkout Silicon (note: all checkouts delete the contents of their working directory)
- name: Checkout Silicon
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
submodules: true

Expand All @@ -45,7 +45,7 @@ jobs:
# Cache path is relative to the directory in which sbt is invoked
run: echo "SBT_OPTS=-Dsbt.global.base=sbt-cache/.sbtboot -Dsbt.boot.directory=sbt-cache/.boot -Dsbt.ivy.home=sbt-cache/.ivy" >> $GITHUB_ENV
- name: Cache sbt
uses: actions/cache@v2
uses: actions/cache@v4
with:
path: |
sbt-cache/.sbtboot
Expand Down Expand Up @@ -85,7 +85,7 @@ jobs:
steps:
# Checkout Silicon (deletes content of working directory)
- name: Checkout Silicon
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
submodules: true

Expand Down Expand Up @@ -147,7 +147,7 @@ jobs:
keep_num: 2
keep_tags: false
- name: Create GitHub pre-release
uses: softprops/action-gh-release@v1
uses: softprops/action-gh-release@v2
with:
tag_name: ${{ env.RELEASE_TAG }}
name: ${{ env.RELEASE_NAME }}
Expand All @@ -158,7 +158,7 @@ jobs:

# # - name: Create an official release
# # if: startsWith(github.ref, 'refs/tags/releases/')
# # uses: softprops/action-gh-release@v1
# # uses: softprops/action-gh-release@v2
# # with:
# # prerelease: false
# # files: ${{ env.RELEASE_DIR }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/update-submodules.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Check out the repo
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
submodules: true

Expand All @@ -41,7 +41,7 @@ jobs:
- name: Open a pull request
id: pr
uses: peter-evans/create-pull-request@v4
uses: peter-evans/create-pull-request@v7
if: (env.PREV_SILVER_REF != env.CUR_SILVER_REF)
with:
# Use viper-admin's token to workaround a restriction of GitHub.
Expand Down
4 changes: 2 additions & 2 deletions src/main/scala/verifier/DefaultMainVerifier.scala
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ import viper.silicon.logger.{MemberSymbExLogger, SymbExLogger}
import viper.silicon.reporting.{MultiRunRecorders, condenseToViperResult}
import viper.silicon.state._
import viper.silicon.state.terms.{Decl, Sort, Term, sorts}
import viper.silicon.supporters._
import viper.silicon.supporters.functions.{DefaultFunctionVerificationUnitProvider, FunctionData}
import viper.silicon.supporters.{DefaultDomainsContributor, DefaultMapsContributor, DefaultMultisetsContributor, DefaultPredicateVerificationUnitProvider, DefaultSequencesContributor, DefaultSetsContributor, MagicWandSnapFunctionsContributor, PredicateData}
import viper.silicon.supporters.qps._
import viper.silicon.supporters.functions.{DefaultFunctionVerificationUnitProvider, FunctionData}
import viper.silicon.utils.Counter
import viper.silver.ast.utility.rewriter.Traverse
import viper.silver.ast.{BackendType, Member}
Expand Down

0 comments on commit 4536a88

Please sign in to comment.