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.

Sign up for GitHub

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

Revert experimental Homebrew changes #3771

Merged
merged 6 commits into from
Oct 30, 2023
+15 −27
Merged

Revert experimental Homebrew changes #3771

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
fb04053
Revert "Clean up Homebrew after running commands (#3768)"
Baltoli Oct 30, 2023
eddecf3
Revert "Fix for Homebrew bottle name on arm64 (#3767)"
Baltoli Oct 30, 2023
f6d2f03
Revert "Install wget in release job (#3766)"
Baltoli Oct 30, 2023
7de10ae
Revert "Move mac release CI to hosted ARM runners (#3764)"
Baltoli Oct 30, 2023
8241fb0
Drop PLT
Baltoli Oct 26, 2023
365e734
Merge branch 'develop' into revert-homebrew
Baltoli Oct 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 15 additions & 27 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ jobs:

macos-build:
name: 'Build MacOS Package'
runs-on: self-macos-13
runs-on: macos-13
timeout-minutes: 120
environment: production
needs: [set-release-id, source-tarball]
Expand All @@ -153,11 +153,6 @@ jobs:
submodules: recursive
path: kframework

- name: Install script dependencies
run: |
brew uninstall -f kframework/k/kframework
brew install wget

- name: Check out matching homebrew repo branch
uses: actions/checkout@v3
id: checkout
Expand Down Expand Up @@ -200,7 +195,7 @@ jobs:
git commit Formula/$PACKAGE.rb -m "Update ${PACKAGE} to ${VERSION}: part 1"
../kframework/package/macos/brew-build-and-update-to-local-bottle ${PACKAGE} ${VERSION} ${ROOT_URL}
git reset HEAD^
LOCAL_BOTTLE_NAME=$(basename $(find . -name "kframework--${VERSION}.arm64_ventura.bottle*.tar.gz"))
LOCAL_BOTTLE_NAME=$(basename $(find . -name "kframework--${VERSION}.ventura.bottle*.tar.gz"))
BOTTLE_NAME=$(echo ${LOCAL_BOTTLE_NAME#./} | sed 's!kframework--!kframework-!')
../kframework/package/macos/brew-update-to-final ${PACKAGE} ${VERSION} ${ROOT_URL}
echo "path=${LOCAL_BOTTLE_NAME}" >> ${GITHUB_OUTPUT}
Expand All @@ -213,11 +208,6 @@ jobs:
name: homebrew
path: homebrew-k

- name: Clean up Homebrew
run: |
brew uninstall -f kframework/k/kframework
brew untap -f kframework/k

- name: Delete Release
if: failure()
uses: actions/[email protected]
Expand All @@ -234,7 +224,7 @@ jobs:

macos-test:
name: 'Test MacOS Package'
runs-on: self-macos-13
runs-on: macos-13
timeout-minutes: 60
environment: production
needs: [macos-build, set-release-id]
Expand Down Expand Up @@ -273,18 +263,21 @@ jobs:
JAVA_HOME: ${{ env.JAVA_HOME_17_X64 }}
HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK: 1
run: |
# The macOS public runners are prone to flakiness when running this
# test suite, so the PL-tutorial is disabled for now.
# - https://github.com/runtimeverification/k/issues/3705
cd homebrew-k-old
brew tap kframework/k "file:///$(pwd)"
brew install ${{ needs.macos-build.outputs.bottle_path }} -v
cp -R /usr/local/share/kframework/pl-tutorial ~
WD=`pwd`
cd
echo 'Starting kserver...'
spawn-kserver $WD/kserver.log
cd pl-tutorial
echo 'Testing tutorial in user environment...'
make -j`sysctl -n hw.ncpu` ${MAKE_EXTRA_ARGS}
cd ~
# cp -R /usr/local/share/kframework/pl-tutorial ~
# WD=`pwd`
# cd
# echo 'Starting kserver...'
# spawn-kserver $WD/kserver.log
# cd pl-tutorial
# echo 'Testing tutorial in user environment...'
# make -j`sysctl -n hw.ncpu` ${MAKE_EXTRA_ARGS}
# cd ~
echo 'module TEST imports BOOL endmodule' > test.k
kompile test.k --backend llvm
kompile test.k --backend haskell
Expand Down Expand Up @@ -319,11 +312,6 @@ jobs:
git remote set-url origin [email protected]:kframework/homebrew-k.git
git push origin master

- name: Clean up Homebrew
run: |
brew uninstall -f kframework/k/kframework
brew untap -f kframework/k

- name: 'Delete Release'
if: failure()
uses: actions/[email protected]
Expand Down