From 7f81a0a25ef032aafb132d499d469fdaeaeb3ebe Mon Sep 17 00:00:00 2001 From: Massimiliano Culpo Date: Thu, 18 Aug 2022 11:13:37 +0200 Subject: [PATCH] CI: move nightly macOS builds from GA to pipelines (#32231) Modifications: - [x] Delete the `macOS builds nightly` workflow - [x] Removed shield in README.md - [x] Moved corresponding specs to `e4s-macos` --- .github/workflows/macos_python.yml | 71 ------------------- README.md | 1 - .../cloud_pipelines/stacks/e4s-mac/spack.yaml | 5 ++ 3 files changed, 5 insertions(+), 72 deletions(-) delete mode 100644 .github/workflows/macos_python.yml diff --git a/.github/workflows/macos_python.yml b/.github/workflows/macos_python.yml deleted file mode 100644 index d07d911da2..0000000000 --- a/.github/workflows/macos_python.yml +++ /dev/null @@ -1,71 +0,0 @@ -# These are nightly package tests for macOS -# focus areas: -# - initial user experience -# - scientific python stack -name: macOS builds nightly - -on: - schedule: - # nightly at 1 AM - - cron: '0 1 * * *' - pull_request: - branches: - - develop - paths: - # Run if we modify this yaml file - - '.github/workflows/macos_python.yml' - # TODO: run if we touch any of the recipes involved in this - -concurrency: - group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.run_number }} - cancel-in-progress: true - -# GitHub Action Limits -# https://help.github.com/en/actions/reference/workflow-syntax-for-github-actions - -jobs: - install_gcc: - name: gcc with clang - if: github.repository == 'spack/spack' - runs-on: macos-latest - steps: - - uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b # @v2 - - uses: actions/setup-python@b55428b1882923874294fa556849718a1d7f2ca5 # @v2 - with: - python-version: 3.9 - - name: spack install - run: | - . .github/workflows/install_spack.sh - # 9.2.0 is the latest version on which we apply homebrew patch - spack install -v --fail-fast gcc@11.2.0 %apple-clang - - install_jupyter_clang: - name: jupyter - if: github.repository == 'spack/spack' - runs-on: macos-latest - timeout-minutes: 700 - steps: - - uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b # @v2 - - uses: actions/setup-python@b55428b1882923874294fa556849718a1d7f2ca5 # @v2 - with: - python-version: 3.9 - - name: spack install - run: | - . .github/workflows/install_spack.sh - spack install -v --fail-fast py-jupyterlab %apple-clang - - install_scipy_clang: - name: scipy, mpl, pd - if: github.repository == 'spack/spack' - runs-on: macos-latest - steps: - - uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b # @v2 - - uses: actions/setup-python@b55428b1882923874294fa556849718a1d7f2ca5 # @v2 - with: - python-version: 3.9 - - name: spack install - run: | - . .github/workflows/install_spack.sh - spack install -v --fail-fast py-scipy %apple-clang - spack install -v --fail-fast py-matplotlib %apple-clang - spack install -v --fail-fast py-pandas %apple-clang diff --git a/README.md b/README.md index df05837be8..fea23bb408 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,6 @@ [![Unit Tests](https://github.com/spack/spack/workflows/linux%20tests/badge.svg)](https://github.com/spack/spack/actions) [![Bootstrapping](https://github.com/spack/spack/actions/workflows/bootstrap.yml/badge.svg)](https://github.com/spack/spack/actions/workflows/bootstrap.yml) -[![macOS Builds (nightly)](https://github.com/spack/spack/workflows/macOS%20builds%20nightly/badge.svg?branch=develop)](https://github.com/spack/spack/actions?query=workflow%3A%22macOS+builds+nightly%22) [![codecov](https://codecov.io/gh/spack/spack/branch/develop/graph/badge.svg)](https://codecov.io/gh/spack/spack) [![Containers](https://github.com/spack/spack/actions/workflows/build-containers.yml/badge.svg)](https://github.com/spack/spack/actions/workflows/build-containers.yml) [![Read the Docs](https://readthedocs.org/projects/spack/badge/?version=latest)](https://spack.readthedocs.io) diff --git a/share/spack/gitlab/cloud_pipelines/stacks/e4s-mac/spack.yaml b/share/spack/gitlab/cloud_pipelines/stacks/e4s-mac/spack.yaml index a97101f16f..34517c1fa9 100644 --- a/share/spack/gitlab/cloud_pipelines/stacks/e4s-mac/spack.yaml +++ b/share/spack/gitlab/cloud_pipelines/stacks/e4s-mac/spack.yaml @@ -22,6 +22,11 @@ spack: - easy_specs: - berkeley-db - ncurses + - gcc + - py-jupyterlab + - py-scipy + - py-matplotlib + - py-pandas - arch: - '%apple-clang@13.1.6 target=m1'