Skip to content

from main to master #151

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 7, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ name: "CodeQL"

on:
push:
branches: [ main, pre-release, develop ]
branches: [ master, pre-release, develop ]
pull_request:
# The branches below must be a subset of the branches above
branches: [ main ]
branches: [ master ]
schedule:
- cron: '0 16 * * 5'

Expand Down Expand Up @@ -44,7 +44,7 @@ jobs:
# If you wish to specify custom queries, you can do so here or in a config file.
# By default, queries listed here will override any specified in a config file.
# Prefix the list here with "+" to use these queries and those in the config file.
# queries: ./path/to/local/query, your-org/your-repo/queries@main
# queries: ./path/to/local/query, your-org/your-repo/queries@master

# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/python-package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ name: Create Python Package

on:
push:
branches: [ main, pre-release ]
branches: [ master, pre-release ]
pull_request:
branches: [ main, pre-release ]
branches: [ master, pre-release ]

jobs:
build:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-drafter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
update_release_draft:
runs-on: ubuntu-latest
steps:
# Drafts your next Release notes as Pull Requests are merged into "main"
# Drafts your next Release notes as Pull Requests are merged into "master"
- uses: release-drafter/release-drafter@v6
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
4 changes: 2 additions & 2 deletions README.rst
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
.. image:: https://github.com/easyScience/EasyReflectometryLib/raw/main/docs/src/_static/logo.png
.. image:: https://github.com/easyScience/EasyReflectometryLib/raw/master/docs/src/_static/logo.png
:target: https://easyscience.github.io/EasyReflectometryLib/

|

.. image:: https://github.com/easyScience/EasyReflectometryLib/actions/workflows/python-ci.yml/badge.svg
:target: https://github.com/easyScience/easyReflectometryLib/actions/workflows/python-ci.yml
.. image:: https://codecov.io/gh/easyScience/EasyReflectometryLib/branch/main/graph/badge.svg?token=LcnB8AMGkw
.. image:: https://codecov.io/gh/easyScience/EasyReflectometryLib/branch/master/graph/badge.svg?token=LcnB8AMGkw
:target: https://codecov.io/gh/easyScience/EasyReflectometryLib
.. image:: https://www.codefactor.io/repository/github/easyscience/easyreflectometrylib/badge
:target: https://www.codefactor.io/repository/github/easyscience/easyreflectometrylib
Expand Down
Loading