diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 1791ec502b0b0f310614f177ea25670f65edb101..8b57bb3b95d1549521f8cb029f9d7e544e977b52 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -2,7 +2,7 @@ name: CI
on:
push:
branches:
- - master
+ - main
pull_request:
schedule:
- cron: '17 3 * * 0'
@@ -19,7 +19,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 "$(basename $GITHUB_REPOSITORY)" examples test
pytest3:
@@ -32,7 +32,7 @@ jobs:
sudo apt-get update
sudo apt-get install openmpi-bin libopenmpi-dev
CONDA_ENVIRONMENT=.test-conda-env-py3.yml
- curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-and-test-py-project-within-miniconda.sh
+ curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/main/build-and-test-py-project-within-miniconda.sh
. ./build-and-test-py-project-within-miniconda.sh
pyexamples3:
@@ -45,7 +45,7 @@ jobs:
sudo apt-get update
sudo apt-get install openmpi-bin libopenmpi-dev
CONDA_ENVIRONMENT=.test-conda-env-py3.yml
- curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/ci-support.sh
+ curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/main/ci-support.sh
. ci-support.sh
build_py_project_in_conda_env
run_examples
@@ -60,7 +60,7 @@ jobs:
sudo apt-get update
sudo apt-get install openmpi-bin libopenmpi-dev
CONDA_ENVIRONMENT=.test-conda-env-py3.yml
- curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/ci-support.sh
+ curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/main/ci-support.sh
. ci-support.sh
build_py_project_in_conda_env
build_docs
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 96e468c51042497d137a371eb847375ea65d387f..b0f0aa6ce26727c33f0820c68cbc204c81976fd9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,7 +3,7 @@ Python 3 POCL:
- export PY_EXE=python3
- export PYOPENCL_TEST=portable:pthread
- export EXTRA_INSTALL="pybind11 numpy mako"
- - 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
@@ -21,7 +21,7 @@ Python 3 Intel:
- export EXTRA_INSTALL="pybind11 numpy mako"
- source /opt/enable-intel-cl.sh
- export PYOPENCL_TEST="intel(r):pu"
- - 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
@@ -38,7 +38,7 @@ Python 3 POCL Examples:
- export PY_EXE=python3
- export PYOPENCL_TEST=portable:pthread
- export EXTRA_INSTALL="pybind11 numpy mako mpi4py pyvisfile pymetis"
- - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-py-project-and-run-examples.sh
+ - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/main/build-py-project-and-run-examples.sh
- ". ./build-py-project-and-run-examples.sh"
tags:
- python3
@@ -53,7 +53,7 @@ Python 3 Intel Examples:
- source /opt/enable-intel-cl.sh
- export PYOPENCL_TEST="intel(r):pu"
- export EXTRA_INSTALL="pybind11 numpy mako mpi4py pyvisfile pymetis"
- - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-py-project-and-run-examples.sh
+ - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/main/build-py-project-and-run-examples.sh
- ". ./build-py-project-and-run-examples.sh"
tags:
- python3
@@ -68,7 +68,7 @@ Python 3 Conda:
- large-node
script: |
CONDA_ENVIRONMENT=.test-conda-env-py3.yml
- curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-and-test-py-project-within-miniconda.sh
+ curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/main/build-and-test-py-project-within-miniconda.sh
# Shut up ibverbs about fork(), e.g. https://gitlab.tiker.net/inducer/grudge/-/jobs/220796
export RDMAV_FORK_SAFE=1
@@ -81,7 +81,7 @@ Python 3 Conda Examples:
- large-node
script: |
CONDA_ENVIRONMENT=.test-conda-env-py3.yml
- curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/ci-support.sh
+ curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/main/ci-support.sh
. ci-support.sh
build_py_project_in_conda_env
@@ -93,14 +93,14 @@ Python 3 Conda Examples:
Documentation:
script:
- EXTRA_INSTALL="pybind11 numpy"
- - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-docs.sh
+ - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/main/build-docs.sh
- ". ./build-docs.sh"
tags:
- python3
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 "$CI_PROJECT_NAME" examples test
tags:
- python3
diff --git a/README.rst b/README.rst
index 95400fe831fef6fc268219dc9ada29bc29460bc7..68c8aed66710eae1630cb84d5fb642405dc3360c 100644
--- a/README.rst
+++ b/README.rst
@@ -1,12 +1,12 @@
grudge
======
-.. image:: https://gitlab.tiker.net/inducer/grudge/badges/master/pipeline.svg
+.. image:: https://gitlab.tiker.net/inducer/grudge/badges/main/pipeline.svg
:alt: Gitlab Build Status
- :target: https://gitlab.tiker.net/inducer/grudge/commits/master
-.. image:: https://github.com/inducer/grudge/workflows/CI/badge.svg?branch=master&event=push
+ :target: https://gitlab.tiker.net/inducer/grudge/commits/main
+.. image:: https://github.com/inducer/grudge/workflows/CI/badge.svg?branch=main&event=push
:alt: Github Build Status
- :target: https://github.com/inducer/grudge/actions?query=branch%3Amaster+workflow%3ACI+event%3Apush
+ :target: https://github.com/inducer/grudge/actions?query=branch%3Amain+workflow%3ACI+event%3Apush
..
.. image:: https://badge.fury.io/py/grudge.png