Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into georgy/simplify-impli…
Browse files Browse the repository at this point in the history
…cation
  • Loading branch information
geo2a committed Jul 24, 2023
2 parents df23380 + adfde29 commit 2e5ac7e
Show file tree
Hide file tree
Showing 177 changed files with 3,087 additions and 1,274 deletions.
26 changes: 26 additions & 0 deletions .github/workflows/master.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
name: "Release"
on:
push:
branches:
- main

jobs:

update-dependents:
name: 'Publish Release'
runs-on: ubuntu-latest
environment: production
steps:
- name: 'Update dependents'
env:
GITHUB_TOKEN: ${{ secrets.JENKINS_GITHUB_PAT }}
run: |
set -x
version="${GITHUB_SHA}"
curl --fail \
-X POST \
-H "Accept: application/vnd.github+json" \
-H "Authorization: Bearer ${GITHUB_TOKEN}" \
-H "X-GitHub-Api-Version: 2022-11-28" \
https://api.github.com/repos/runtimeverification/devops/dispatches \
-d '{"event_type":"on-demand-test","client_payload":{"repo":"runtimeverification/hs-backend-booster","version":"'${version}'"}}'
4 changes: 4 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -219,3 +219,7 @@ jobs:
done
echo "${{ matrix.nix }}" >> $GITHUB_STEP_SUMMARY
cat imp.md >> $GITHUB_STEP_SUMMARY
- name: Check shell
run: GC_DONT_GC=1 nix develop --print-build-logs --command cabal --version
74 changes: 74 additions & 0 deletions .github/workflows/update-deps.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
name: 'Update Nix Flake Inputs'
on:
push:
branches:
- '_update-deps/runtimeverification/haskell-backend'
workflow_dispatch:
# Stop in progress workflows on the same branch and same workflow to use latest committed code
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

env:
ghc_version: "9.2.8"
stack_version: "2.9.3"

jobs:

nix-flake-submodule-sync:
name: 'Nix flake submodule sync'
runs-on: ubuntu-20.04
steps:
- name: 'Check out code, set up Git'
uses: actions/checkout@v3
with:
token: ${{ secrets.JENKINS_GITHUB_PAT }}
submodules: recursive
- run: |
git config --global user.name rv-jenkins
git config --global user.email [email protected]
- name: 'Install Nix'
uses: cachix/install-nix-action@v22
with:
install_url: https://releases.nixos.org/nix/nix-2.13.3/install
extra_nix_config: |
access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
substituters = http://cache.nixos.org https://hydra.iohk.io
trusted-public-keys = cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ=
- name: 'Install Cachix'
uses: cachix/cachix-action@v12
with:
name: k-framework
authToken: '${{ secrets.CACHIX_PUBLIC_TOKEN }}'

- uses: haskell/actions/setup@v2
id: setup-haskell
with:
ghc-version: ${{ env.ghc_version }}
stack-version: ${{ env.stack_version }}
enable-stack: true
stack-setup-ghc: true
cabal-update: true

- name: 'Update Nix flake from haskell backend release tag'
run: |
set -euxo pipefail
changed=false
haskell_backend_version=$(cat deps/haskell-backend_release)
sed -i 's! haskell-backend.url = "github:runtimeverification/haskell-backend/[0-9a-f]*";! haskell-backend.url = "github:runtimeverification/haskell-backend/'${haskell_backend_version}'";!' flake.nix
if ! git diff --exit-code flake.nix; then
git add flake.nix
changed=true
fi
if ${changed}; then
cabal update
scripts/update-haskell-backend.sh ${haskell_backend_version}
git add flake.lock stack.yaml cabal.project cabal.project.freeze
git commit -m "update haskell-backend to version ${haskell_backend_version}"
git push
fi
17 changes: 9 additions & 8 deletions cabal.project
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
optimization: False
jobs: 4
packages: .

index-state: 2023-06-29T00:00:00Z
Expand All @@ -7,17 +9,16 @@ allow-newer:
ghc-trace-events:base,
ghc-bignum:base

source-repository-package
type: git
location: https://github.com/co-log/co-log.git
tag: v0.5.0.0
--sha256: sha256-zs+cQf2bIQEaN10eEg8VJkCp0pQcTuXpUovCev5C6dc=
-- source-repository-package
-- type: git
-- location: https://github.com/co-log/co-log.git
-- tag: v0.5.0.0
-- --sha256: sha256-zs+cQf2bIQEaN10eEg8VJkCp0pQcTuXpUovCev5C6dc=

-- Do not move the order of `location`, `tag` and `--sha256` fields below as this will break the update script
source-repository-package
type: git
location: https://github.com/runtimeverification/haskell-backend.git
tag: 039722de1227289ec71d66b5d267ed955e1b426f
--sha256: sha256-6Oci+9wMwgDx+ZeKQjA7kxLrBjxpwWOaKMBelQb+yAE=
tag: e8114e924d219160f18ca458cddadddb59ea0cc7
--sha256: sha256-GIhzuuvoVX7ocazHSOL1rQf2GYWn5eHMSwakP/HgL6I=
subdir: kore kore-rpc-types

4 changes: 1 addition & 3 deletions cabal.project.freeze
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ constraints: any.Cabal ==3.6.3.0,
aeson -cffi +ordered-keymap,
any.aeson-pretty ==0.8.9,
aeson-pretty -lib-only,
any.alex ==3.4.0.0,
any.ansi-terminal ==0.11.4,
ansi-terminal -example +win32-2-13-1,
any.ansi-wl-pprint ==0.6.9,
Expand Down Expand Up @@ -115,7 +114,6 @@ constraints: any.Cabal ==3.6.3.0,
any.gitrev ==1.3.1,
any.graphviz ==2999.20.1.0,
graphviz -test-parsing,
any.happy ==1.20.1.1,
any.hashable ==1.4.2.0,
hashable +integer-gmp -random-initial-seed,
any.hashtables ==1.3.1,
Expand Down Expand Up @@ -300,7 +298,7 @@ constraints: any.Cabal ==3.6.3.0,
any.wl-pprint-text ==1.2.0.2,
any.xml-conduit ==1.9.1.2,
any.xml-types ==0.3.8,
any.yaml ==0.11.11.0,
any.yaml ==0.11.11.1,
yaml +no-examples +no-exe,
any.zigzag ==0.0.1.0,
any.zlib ==0.6.3.0,
Expand Down
1 change: 1 addition & 0 deletions deps/haskell-backend_release
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
3ac2c87da44ed9e8fe4ba4583fb5860a4680d821
Loading

0 comments on commit 2e5ac7e

Please sign in to comment.