Skip to content

Commit

Permalink
Merge pull request #58 from inducer/master-to-main
Browse files Browse the repository at this point in the history
CI/README: master->main
  • Loading branch information
inducer authored Mar 8, 2021
2 parents 3604185 + e500b0b commit 079a809
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: CI
on:
push:
branches:
- master
- main
pull_request:
paths-ignore:
- 'doc/*.rst'
Expand All @@ -21,7 +21,7 @@ jobs:
python-version: '3.x'
- name: "Main Script"
run: |
curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/prepare-and-run-flake8.sh
curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/main/prepare-and-run-flake8.sh
. ./prepare-and-run-flake8.sh ./pycparserext ./test
pytest:
Expand All @@ -38,7 +38,7 @@ jobs:
python-version: ${{ matrix.python-version }}
- name: "Main Script"
run: |
curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-and-test-py-project.sh
curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/main/build-and-test-py-project.sh
. ./build-and-test-py-project.sh
# vim: sw=4
4 changes: 2 additions & 2 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Python 3:
script:
- py_version=3
- curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-and-test-py-project.sh
- curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/main/build-and-test-py-project.sh
- ". ./build-and-test-py-project.sh"
tags:
- python3
Expand All @@ -13,7 +13,7 @@ Python 3:

Flake8:
script:
- curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/prepare-and-run-flake8.sh
- curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/main/prepare-and-run-flake8.sh
- ". ./prepare-and-run-flake8.sh pycparserext test"
tags:
- python3
Expand Down
8 changes: 4 additions & 4 deletions README.rst
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
Extended functionality for pycparser
====================================

.. image:: https://gitlab.tiker.net/inducer/pycparserext/badges/master/pipeline.svg
.. image:: https://gitlab.tiker.net/inducer/pycparserext/badges/main/pipeline.svg
:alt: Gitlab Build Status
:target: https://gitlab.tiker.net/inducer/pycparserext/commits/master
.. image:: https://github.com/inducer/pycparserext/workflows/CI/badge.svg?branch=master&event=push
:target: https://gitlab.tiker.net/inducer/pycparserext/commits/main
.. image:: https://github.com/inducer/pycparserext/workflows/CI/badge.svg?branch=main&event=push
:alt: Github Build Status
:target: https://github.com/inducer/pycparserext/actions?query=branch%3Amaster+workflow%3ACI+event%3Apush
:target: https://github.com/inducer/pycparserext/actions?query=branch%3Amain+workflow%3ACI+event%3Apush
.. image:: https://badge.fury.io/py/pycparserext.png
:alt: Python Package Index Release Page
:target: https://pypi.org/project/pycparserext/
Expand Down

0 comments on commit 079a809

Please sign in to comment.