From ed334ac050fe3673a09696a96d288497628d2409 Mon Sep 17 00:00:00 2001 From: Erik Sundell Date: Sat, 15 Apr 2023 08:39:52 +0200 Subject: [PATCH] ci/docs: finalize transition to main branch --- .circleci/config.yml | 2 +- .github/workflows/integration-test.yaml | 2 +- README.md | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 622622e..d344bc3 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -113,7 +113,7 @@ jobs: - run: name: Check upgrade testing command: | - if [ "$CIRCLE_BRANCH" == "master" ]; then + if [ "$CIRCLE_BRANCH" == "main" ]; then echo "On master, no upgrade to test..." circleci-agent step halt else diff --git a/.github/workflows/integration-test.yaml b/.github/workflows/integration-test.yaml index 940340d..b0ba46a 100644 --- a/.github/workflows/integration-test.yaml +++ b/.github/workflows/integration-test.yaml @@ -71,7 +71,7 @@ jobs: - name: "Int. tests: Ubuntu 22.04, Py 3.10, --upgrade" distro_image: "ubuntu:22.04" extra_flags: --upgrade - dont_run_on_ref: refs/heads/master + dont_run_on_ref: refs/heads/main integration-tests: needs: decide-on-test-jobs-to-run diff --git a/README.md b/README.md index 46f2d19..d16de87 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ [![Documentation build status](https://img.shields.io/readthedocs/the-littlest-jupyterhub?logo=read-the-docs)](https://tljh.jupyter.org/en/latest/?badge=latest) [![GitHub Workflow Status - Test](https://img.shields.io/github/workflow/status/jupyterhub/the-littlest-jupyterhub/Unit%20tests?logo=github&label=tests)](https://github.com/jupyterhub/the-littlest-jupyterhub/actions) -[![Test coverage of code](https://codecov.io/gh/jupyterhub/the-littlest-jupyterhub/branch/master/graph/badge.svg)](https://codecov.io/gh/jupyterhub/the-littlest-jupyterhub) +[![Test coverage of code](https://codecov.io/gh/jupyterhub/the-littlest-jupyterhub/branch/main/graph/badge.svg)](https://codecov.io/gh/jupyterhub/the-littlest-jupyterhub) [![GitHub](https://img.shields.io/badge/issue_tracking-github-blue?logo=github)](https://github.com/jupyterhub/the-littlest-jupyterhub/issues) [![Discourse](https://img.shields.io/badge/help_forum-discourse-blue?logo=discourse)](https://discourse.jupyter.org/c/jupyterhub/tljh) [![Gitter](https://img.shields.io/badge/social_chat-gitter-blue?logo=gitter)](https://gitter.im/jupyterhub/jupyterhub)