From fb040539c41d222a00814f367658cef022238e74 Mon Sep 17 00:00:00 2001 From: Bruce Collie Date: Mon, 30 Oct 2023 11:36:47 +0000 Subject: [PATCH 1/5] Revert "Clean up Homebrew after running commands (#3768)" This reverts commit 8e0528b473ecde7b6a847de5f30f5907698d2912. --- .github/workflows/release.yml | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 88f010004d1..4a37b09027b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -213,11 +213,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/github-script@v6.0.0 @@ -319,11 +314,6 @@ jobs: git remote set-url origin git@github.com: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/github-script@v6.0.0 From eddecf34d1da87fcb75f1a40bb4ea3c273320568 Mon Sep 17 00:00:00 2001 From: Bruce Collie Date: Mon, 30 Oct 2023 11:36:56 +0000 Subject: [PATCH 2/5] Revert "Fix for Homebrew bottle name on arm64 (#3767)" This reverts commit 8452a4cb3317548ec39c46023149197489e9cf62. --- .github/workflows/release.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 4a37b09027b..5a591e30597 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -154,9 +154,7 @@ jobs: path: kframework - name: Install script dependencies - run: | - brew uninstall -f kframework/k/kframework - brew install wget + run: brew install wget - name: Check out matching homebrew repo branch uses: actions/checkout@v3 @@ -200,7 +198,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} From f6d2f03dbeb1055bb3bd5d6cdf21819c0dc4dd37 Mon Sep 17 00:00:00 2001 From: Bruce Collie Date: Mon, 30 Oct 2023 11:37:07 +0000 Subject: [PATCH 3/5] Revert "Install wget in release job (#3766)" This reverts commit 5dc19b3ca46276c557682a459dd33a5620568e2e. --- .github/workflows/release.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 5a591e30597..c0a2a2dd350 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -153,9 +153,6 @@ jobs: submodules: recursive path: kframework - - name: Install script dependencies - run: brew install wget - - name: Check out matching homebrew repo branch uses: actions/checkout@v3 id: checkout From 7de10aec26a159f5dea98ebd915ada615402e22c Mon Sep 17 00:00:00 2001 From: Bruce Collie Date: Mon, 30 Oct 2023 11:37:17 +0000 Subject: [PATCH 4/5] Revert "Move mac release CI to hosted ARM runners (#3764)" This reverts commit 261586ebf35fbfd09a5c4a0d15d57f41fc9a74db. --- .github/workflows/release.yml | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c0a2a2dd350..63db58f9c36 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -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] @@ -224,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] @@ -273,7 +273,14 @@ jobs: spawn-kserver $WD/kserver.log cd pl-tutorial echo 'Testing tutorial in user environment...' - make -j`sysctl -n hw.ncpu` ${MAKE_EXTRA_ARGS} + # The macOS public runners are prone to flakiness when running this + # test suite with high parallelism: + # - https://github.com/runtimeverification/k/issues/3705 + # We know that there are 4 CPUs on macos-13 runners, so rather than + # using them all, we use only 2 to reduce load on the machine. Old + # command: + # make -j`sysctl -n hw.ncpu` ${MAKE_EXTRA_ARGS} + make -j2 ${MAKE_EXTRA_ARGS} cd ~ echo 'module TEST imports BOOL endmodule' > test.k kompile test.k --backend llvm From 8241fb07079edc607664d9537ffbfebabd9de967 Mon Sep 17 00:00:00 2001 From: Bruce Collie Date: Thu, 26 Oct 2023 22:00:50 +0100 Subject: [PATCH 5/5] Drop PLT --- .github/workflows/release.yml | 28 ++++++++++++---------------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 63db58f9c36..2bd36567051 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -263,25 +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...' - # The macOS public runners are prone to flakiness when running this - # test suite with high parallelism: - # - https://github.com/runtimeverification/k/issues/3705 - # We know that there are 4 CPUs on macos-13 runners, so rather than - # using them all, we use only 2 to reduce load on the machine. Old - # command: - # make -j`sysctl -n hw.ncpu` ${MAKE_EXTRA_ARGS} - make -j2 ${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