Skip to content

Commit

Permalink
Merge branch 'master' into sam/mavenix-version-fix
Browse files Browse the repository at this point in the history
  • Loading branch information
goodlyrottenapple authored Nov 7, 2023
2 parents a8e0458 + c224832 commit df8c7cc
Show file tree
Hide file tree
Showing 5 changed files with 28 additions and 4 deletions.
24 changes: 24 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,18 @@ jobs:
restore-keys: |
${{ runner.os }}-maven-
- name: Mac Dependencies
run: |
# Via: https://github.com/ledger/ledger/commit/1eec9f86667cad3b0bbafb82a83739a0d30ca09f
# Unlink and re-link to prevent errors when github mac runner images
# install python outside of brew, for example:
# https://github.com/orgs/Homebrew/discussions/3895
# https://github.com/actions/setup-python/issues/577
# https://github.com/actions/runner-images/issues/6459
# https://github.com/actions/runner-images/issues/6507
# https://github.com/actions/runner-images/issues/2322
brew list -1 | grep python | while read formula; do brew unlink $formula; brew link --overwrite $formula; done
- name: Build brew bottle
id: build
env:
Expand Down Expand Up @@ -255,6 +267,18 @@ jobs:
name: homebrew
path: homebrew-k-old

- name: Mac Dependencies
run: |
# Via: https://github.com/ledger/ledger/commit/1eec9f86667cad3b0bbafb82a83739a0d30ca09f
# Unlink and re-link to prevent errors when github mac runner images
# install python outside of brew, for example:
# https://github.com/orgs/Homebrew/discussions/3895
# https://github.com/actions/setup-python/issues/577
# https://github.com/actions/runner-images/issues/6459
# https://github.com/actions/runner-images/issues/6507
# https://github.com/actions/runner-images/issues/2322
brew list -1 | grep python | while read formula; do brew unlink $formula; brew link --overwrite $formula; done
- name: 'Test brew bottle'
id: test
env:
Expand Down
2 changes: 1 addition & 1 deletion install-k
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/sh -e

K_VERSION=6.0.0
K_VERSION=6.0.195

if [ `id -u` -ne 0 ]; then
echo "$0: error: This script must be run as root."
Expand Down
2 changes: 1 addition & 1 deletion package/arch/PKGBUILD
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Maintainer: Dwight Guth <[email protected]>
pkgname=kframework-git
pkgver=6.0.0
pkgver=6.0.178
pkgrel=1
epoch=
pkgdesc="K framework toolchain. Includes K Framework compiler for K language definitions, and K interpreter and prover for programs written in languages defined in K."
Expand Down
2 changes: 1 addition & 1 deletion package/debian/changelog
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
kframework (6.0.0) unstable; urgency=medium
kframework (6.0.195) unstable; urgency=medium

* Initial Release.

Expand Down
2 changes: 1 addition & 1 deletion package/version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
6.0.0
6.0.195

0 comments on commit df8c7cc

Please sign in to comment.