Skip to content

Commit

Permalink
Rename the default branch to main
Browse files Browse the repository at this point in the history
  • Loading branch information
bryanwweber committed Jul 1, 2020
1 parent fa0bf65 commit d96d2c4
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ on:
# Build on tags that look like releases
tags:
- v*
# Build when master is pushed to
# Build when main is pushed to
branches:
- master
- main
pull_request:
# Build when a pull request targets master
# Build when a pull request targets main
branches:
- master
- main
env:
MW_HEADERS_DIR: ${{ github.workspace }}/../mw_headers
MACOSX_DEPLOYMENT_TARGET: "10.9"
Expand Down Expand Up @@ -77,4 +77,4 @@ jobs:
run: |
anaconda --token ${{ secrets.ANACONDA_TOKEN }} upload --force --label dev $CONDA/conda-bld/*/*cantera*.tar.bz2
shell: bash -l {0}
if: github.event_name == 'push' && github.event.ref == 'refs/heads/master'
if: github.event_name == 'push' && github.event.ref == 'refs/heads/main'
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
This repository hosts the recipe to build the Python interface for Cantera into a conda package. The package is built on Appveyor and TravisCI and uploaded to Anaconda.org automatically.
This repository hosts the recipe to build the Python interface for Cantera into a conda package. The package is built on GitHub Actions and uploaded to Anaconda.org automatically.

[![Build status](https://ci.appveyor.com/api/projects/status/t78m6c0x3rofe1mi/branch/master?svg=true)](https://ci.appveyor.com/project/Cantera/conda-recipes/branch/master) [![Build Status](https://travis-ci.org/Cantera/conda-recipes.svg?branch=master)](https://travis-ci.org/Cantera/conda-recipes)
![CI](https://github.com/Cantera/conda-recipes/workflows/CI/badge.svg)

0 comments on commit d96d2c4

Please sign in to comment.