diff --git a/.github/workflows/ci-osx.yml b/.github/workflows/ci-osx.yml deleted file mode 100644 index 332fb8af..00000000 --- a/.github/workflows/ci-osx.yml +++ /dev/null @@ -1,71 +0,0 @@ -# ********************************************************** -# Copyright (c) 2020-2022 Google, Inc. All rights reserved. -# ********************************************************** - -# Dr. Memory: the memory debugger -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; -# version 2.1 of the License, and no later version. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Library General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -# Github Actions workflow for Mac OSX Continuous Integration testing. - -name: ci-osx -on: - # Run on pushes to master and on pull request changes, including from a - # forked repo with no "push" trigger, while avoiding duplicate triggers. - push: - branches: - - master - pull_request: - types: [opened, reopened, synchronize] - - # Manual trigger using the Actions page. May remove when integration complete. - workflow_dispatch: - -defaults: - run: - shell: bash - -jobs: - # 64-bit OSX build with clang and tests: - osx-x86-64: - runs-on: macos-11 - - steps: - - uses: actions/checkout@v2 - with: - submodules: recursive - - # Cancel any prior runs for a PR (but do not cancel master branch runs). - - uses: n1hility/cancel-previous-runs@v2 - with: - token: ${{ secrets.GITHUB_TOKEN }} - if: ${{ github.event_name == 'pull_request' }} - - - name: Fetch Sources - run: git fetch --no-tags --depth=1 origin master - - - name: Create Build Environment - run: brew install nasm zlib snappy lz4 - - - name: Run Suite - working-directory: ${{ github.workspace }} - run: ./tests/runsuite_wrapper.pl travis - env: - # Change xcode version for current session: - # https://www.unix.com/man-page/osx/1/xcode-select/ - # https://github.community/t/selecting-an-xcode-version/16204/3 - # To find available versions, add the following as a step above: - # - run: ls -l /Applications - DEVELOPER_DIR: /Applications/Xcode_13.2.1.app/Contents/Developer diff --git a/.github/workflows/ci-package.yml b/.github/workflows/ci-package.yml index e31c1e28..f4b109e5 100644 --- a/.github/workflows/ci-package.yml +++ b/.github/workflows/ci-package.yml @@ -120,52 +120,7 @@ jobs: ########################################################################### # Mac tarball with x86-64 build: - osx: - runs-on: macos-11 - - steps: - - uses: actions/checkout@v2 - with: - submodules: recursive - - - name: Fetch Sources - run: git fetch --no-tags --depth=1 origin master - - - name: Create Build Environment - run: brew install nasm zlib snappy lz4 - - - name: Get Version - id: version - # XXX: See x86 job comments on sharing the default ver# with CMakeLists.txt. - run: | - if test -z "${{ github.event.inputs.version }}"; then - export PATCHLEVEL=$((`git log -n 1 --format=%ct` / (60*60*24))) - export PATCHLEVEL=$(((PATCHLEVEL %200) + 56)) - export VERSION_NUMBER="2.6.${PATCHLEVEL}" - export PREFIX="cronbuild-" - else - export VERSION_NUMBER=${{ github.event.inputs.version }} - export PREFIX="release_" - fi - if [ "${{ github.event.inputs.build }}" -ne 0 ]; then - export VERSION_NUMBER="${VERSION_NUMBER}-${{ github.event.inputs.build }}" - fi - echo "::set-output name=version_number::${VERSION_NUMBER}" - - - name: Build Package - working-directory: ${{ github.workspace }} - run: ./tests/runsuite_wrapper.pl travis - env: - CI_TARGET: package - VERSION_NUMBER: ${{ steps.version.outputs.version_number }} - # See ci-osx.yml comments: we need to set the xcode version. - DEVELOPER_DIR: /Applications/Xcode_13.2.1.app/Contents/Developer - - - name: Upload Artifacts - uses: actions/upload-artifact@v2 - with: - name: mac-tarball - path: DrMemory-MacOS-${{ steps.version.outputs.version_number }}.tar.gz + # TODO i#2511: re-enable once it works on macos-12. ########################################################################### # Windows .zip and .msi with 32-bit and 64-bit x86 builds: