Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into factored-booster-…
Browse files Browse the repository at this point in the history
…kompilation
  • Loading branch information
ehildenb committed Aug 24, 2023
2 parents 49f6414 + ae7faf1 commit 99f4358
Show file tree
Hide file tree
Showing 12 changed files with 33 additions and 23 deletions.
3 changes: 3 additions & 0 deletions .github/workflows/master-push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ jobs:
uses: actions/checkout@v3
with:
ref: ${{ github.event.push.head.sha }}
fetch-depth: 0
- name: 'Upgrade bash'
if: ${{ contains(matrix.os, 'macos') }}
run: brew install bash
Expand Down Expand Up @@ -61,6 +62,7 @@ jobs:
with:
submodules: recursive
ref: ${{ github.event.push.head.sha }}
fetch-depth: 0
- name: 'Set up Docker'
uses: ./.github/actions/with-docker
with:
Expand Down Expand Up @@ -119,6 +121,7 @@ jobs:
uses: actions/checkout@v3
with:
ref: ${{ github.event.push.head.sha }}
fetch-depth: 0
- name: 'Make Release'
env:
GITHUB_TOKEN: ${{ secrets.JENKINS_GITHUB_PAT }}
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/test-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ jobs:
uses: actions/checkout@v3
with:
submodules: true
fetch-depth: 0
- name: 'Install Poetry'
uses: Gr1N/setup-poetry@v8
- name: 'Build kevm'
Expand Down Expand Up @@ -136,6 +137,7 @@ jobs:
uses: actions/checkout@v3
with:
submodules: recursive
fetch-depth: 0
- name: 'Set up Docker'
uses: ./.github/actions/with-docker
with:
Expand Down Expand Up @@ -178,6 +180,7 @@ jobs:
uses: actions/checkout@v3
with:
submodules: recursive
fetch-depth: 0
- name: 'Set up Docker'
uses: ./.github/actions/with-docker
with:
Expand All @@ -203,6 +206,7 @@ jobs:
uses: actions/checkout@v3
with:
submodules: recursive
fetch-depth: 0
- name: 'Set up Docker'
uses: ./.github/actions/with-docker
with:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/update-foundry-prove.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ jobs:
submodules: recursive
token: ${{ secrets.JENKINS_GITHUB_PAT }}
ref: ${{ github.events.inputs.branch }}
fetch-depth: 0
- name: 'Configure GitHub user'
run: |
git config user.name devops
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/update-version.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ jobs:
with:
submodules: recursive
token: ${{ secrets.JENKINS_GITHUB_PAT }}
fetch-depth: 0
- name: 'Configure GitHub user'
run: |
git config user.name devops
Expand Down
2 changes: 1 addition & 1 deletion deps/k_release
Original file line number Diff line number Diff line change
@@ -1 +1 @@
6.0.63
6.0.67
2 changes: 1 addition & 1 deletion deps/pyk_release
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v0.1.422
v0.1.425
22 changes: 11 additions & 11 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/b01f185e4866de7c5b5a82f833ca9ea3c3f72fc4";
k-framework.url = "github:runtimeverification/k/v6.0.63";
k-framework.url = "github:runtimeverification/k/v6.0.67";
k-framework.inputs.nixpkgs.follows = "nixpkgs";
#nixpkgs.follows = "k-framework/nixpkgs";
flake-utils.follows = "k-framework/flake-utils";
Expand All @@ -17,7 +17,7 @@
ethereum-legacytests.url = "github:ethereum/legacytests/d7abc42a7b352a7b44b1f66b58aca54e4af6a9d7";
ethereum-legacytests.flake = false;
haskell-backend.follows = "k-framework/haskell-backend";
pyk.url = "github:runtimeverification/pyk/v0.1.422";
pyk.url = "github:runtimeverification/pyk/v0.1.425";
pyk.inputs.flake-utils.follows = "k-framework/flake-utils";
pyk.inputs.nixpkgs.follows = "k-framework/nixpkgs";
foundry.url = "github:shazow/foundry.nix/monthly"; # Use monthly branch for permanent releases
Expand Down
8 changes: 4 additions & 4 deletions kevm-pyk/poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions kevm-pyk/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"

[tool.poetry]
name = "kevm-pyk"
version = "1.0.275"
version = "1.0.276"
description = ""
authors = [
"Runtime Verification, Inc. <contact@runtimeverification.com>",
Expand All @@ -17,7 +17,7 @@ packages = [
[tool.poetry.dependencies]
python = "^3.10"
pathos = "*"
pyk = { git = "https://github.com/runtimeverification/pyk.git", tag="v0.1.422" }
pyk = { git = "https://github.com/runtimeverification/pyk.git", tag="v0.1.425" }
tomlkit = "^0.11.6"

[tool.poetry.group.dev.dependencies]
Expand Down
3 changes: 2 additions & 1 deletion package/debian/changelog
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
kevm (1.0.275) unstable; urgency=medium
kevm (1.0.276) unstable; urgency=medium

* Initial Release.

-- Everett Hildenbrandt <everett.hildenbrandt@runtimeverification.com> Tue, 16 Jul 2019 00:14:12 -0700

2 changes: 1 addition & 1 deletion package/version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.0.275
1.0.276

0 comments on commit 99f4358

Please sign in to comment.