Skip to content

Commit e40ef17

Browse files
Changing references of lightning master to main (#1356)
**Context:** The default branch of pennylane-lightning will be changed from `master` to `main`. The references to `master` need to be updated. **Description of the Change:** Change references of `master` to `main` **Benefits:** The default branch gets updated. **Possible Drawbacks:** None **Related GitHub Issues:** --------- Co-authored-by: ringo-but-quantum <github-ringo-but-quantum@xanadu.ai>
1 parent 274fd42 commit e40ef17

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+184
-130
lines changed

.github/CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,9 @@
3535

3636
<h3>Internal changes ⚙️</h3>
3737

38+
- Change default branch references from `master` to `main`.
39+
[(#1356)](https://github.com/PennyLaneAI/pennylane-lightning/pull/1356)
40+
3841
- Upgrade CIs to use CUDA 12.9.
3942
[(#1353)](https://github.com/PennyLaneAI/pennylane-lightning/pull/1353)
4043
[(#1354)](https://github.com/PennyLaneAI/pennylane-lightning/pull/1354)

.github/workflows/changelog_reminder.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
changelog_regex: '.github/CHANGELOG.md'
1717
customPrMessage: |
1818
Hello. You may have forgotten to update the changelog!
19-
Please edit [.github/CHANGELOG.md](/PennyLaneAI/pennylane-lightning/blob/master/.github/CHANGELOG.md) with:
19+
Please edit [.github/CHANGELOG.md](/PennyLaneAI/pennylane-lightning/blob/main/.github/CHANGELOG.md) with:
2020
* A one-to-two sentence description of the change. You may include a small working example for new features.
2121
* A link back to this PR.
2222
* Your name (or GitHub username) in the contributors section.

.github/workflows/code_security_scan.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ on:
33
pull_request:
44
push:
55
branches:
6-
- master
6+
- main
77

88
concurrency:
99
group: code-security-scan-${{ github.workflow }}-${{ github.ref }}
@@ -25,4 +25,3 @@ jobs:
2525
semgrep-error-on-impact: HIGH
2626
semgrep-error-on-severity: ERROR
2727
bandit-error-on-severity: HIGH
28-

.github/workflows/compat-docker-latest.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
name: Docker latest - Linux::x86_64
1515
uses: ./.github/workflows/docker_linux_x86_64.yml
1616
with:
17-
lightning-version: master
17+
lightning-version: main
1818
pennylane-version: main
1919
push-to-dockerhub: false
2020
secrets: inherit # pass all secrets

.github/workflows/dev_version_script.py

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -83,15 +83,15 @@ def update_prerelease_version(repo_root_path: Path, version: Version):
8383
parser = argparse.ArgumentParser()
8484
parser.add_argument("--pr-path", dest="pr", type=Path, required=True, help="Path to the PR dir")
8585
parser.add_argument(
86-
"--master-path", dest="master", type=Path, required=True, help="Path to the master dir"
86+
"--main-path", dest="main", type=Path, required=True, help="Path to the main dir"
8787
)
8888

8989
args = parser.parse_args()
9090

9191
pr_version = extract_version(args.pr)
92-
master_version = extract_version(args.master)
92+
main_version = extract_version(args.main)
9393

94-
print("Got Package Version from 'master' ->", str(master_version))
94+
print("Got Package Version from 'main' ->", str(main_version))
9595
print("Got Package Version from 'PR' ->", str(pr_version))
9696

9797
# Only attempt to bump the version if the pull_request is:
@@ -102,7 +102,7 @@ def update_prerelease_version(repo_root_path: Path, version: Version):
102102
# This captures the case during release where we might bump the release version
103103
# within a PR and reset tag back to dev0
104104
if (
105-
pr_version > master_version
105+
pr_version > main_version
106106
and pr_version.prerelease
107107
and pr_version.prerelease == DEV_PRERELEASE_TAG_START
108108
):
@@ -111,22 +111,22 @@ def update_prerelease_version(repo_root_path: Path, version: Version):
111111
)
112112
print("If this is happening in error, please report it to the PennyLane team!")
113113
elif pr_version.prerelease and pr_version.prerelease.startswith(DEV_PRERELEASE_TAG_PREFIX):
114-
# If master branch does not have a prerelease (for any reason) OR does not have an ending number
114+
# If main branch does not have a prerelease (for any reason) OR does not have an ending number
115115
# Then default to the starting tag
116-
if not master_version.prerelease or master_version.prerelease == DEV_PRERELEASE_TAG_PREFIX:
116+
if not main_version.prerelease or main_version.prerelease == DEV_PRERELEASE_TAG_PREFIX:
117117
next_prerelease_version = DEV_PRERELEASE_TAG_START
118118
else:
119-
# If master branch does not have a prerelease (for any reason) OR does not have an ending number
119+
# If main branch does not have a prerelease (for any reason) OR does not have an ending number
120120
# Then default to the starting tag
121121
if (
122-
not master_version.prerelease
123-
or master_version.prerelease == DEV_PRERELEASE_TAG_PREFIX
122+
not main_version.prerelease
123+
or main_version.prerelease == DEV_PRERELEASE_TAG_PREFIX
124124
):
125125
next_prerelease_version = DEV_PRERELEASE_TAG_START
126126
else:
127-
# Generate the next prerelease version (eg: dev1 -> dev2). Sourcing from master version.
128-
next_prerelease_version = master_version.next_version("prerelease").prerelease
129-
new_version = master_version.replace(prerelease=next_prerelease_version)
127+
# Generate the next prerelease version (eg: dev1 -> dev2). Sourcing from main version.
128+
next_prerelease_version = main_version.next_version("prerelease").prerelease
129+
new_version = main_version.replace(prerelease=next_prerelease_version)
130130
if pr_version != new_version:
131131
print(f"Updating PR package version from -> '{pr_version}', to -> {new_version}")
132132
update_prerelease_version(args.pr, new_version)

.github/workflows/format.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ on:
33
pull_request:
44
push:
55
branches:
6-
- master
6+
- main
77

88
concurrency:
99
group: format-${{ github.ref }}

.github/workflows/pre_release_version_bump.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,4 +35,4 @@ jobs:
3535
body: updated changelog and _version.py
3636
branch: pre-release-version-bump
3737
reviewers: tomlqc, maliasadi
38-
base: master
38+
base: main
Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
# This workflow syncs the main branch to master every weekday. It will remain until the master branch is deleted.
2+
name: Sync main to master
3+
4+
on:
5+
# Scheduled trigger every weekday at 2:47am UTC
6+
schedule:
7+
- cron: '47 2 * * 1-5'
8+
workflow_dispatch:
9+
10+
jobs:
11+
sync:
12+
runs-on: ubuntu-latest
13+
steps:
14+
- uses: actions/checkout@v6
15+
with:
16+
ref: master
17+
token: ${{ secrets.PENNYLANE_MASTER_MAIN_WRITE }}
18+
fetch-depth: 0
19+
20+
- name: Sync main to master
21+
run: |
22+
git fetch origin
23+
git config user.name "github-actions[bot]"
24+
git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
25+
if git merge --no-commit --ff-only origin/main; then
26+
echo "Synching from main to master."
27+
echo "merge_conflict=false" >> $GITHUB_ENV
28+
git push origin master
29+
else
30+
echo "Merge conflict detected. Creating a PR ..."
31+
echo "merge_conflict=true" >> $GITHUB_ENV
32+
git merge --abort || true
33+
fi
34+
35+
# If there are conflicts, create a PR for resolution
36+
- name: Create PR for conflict resolution
37+
env:
38+
GH_TOKEN: ${{ secrets.PENNYLANE_MASTER_MAIN_WRITE }}
39+
if: env.merge_conflict == 'true'
40+
run: |
41+
git checkout main
42+
BRANCH="main_$(date +'%Y-%m-%d-%H-%M-%S')"
43+
echo "tmp_branch=$BRANCH" >> $GITHUB_ENV
44+
git checkout -b "$BRANCH"
45+
git config user.name "GitHub Actions Bot"
46+
git config user.email "<>"
47+
if ! git diff --quiet origin/master origin/main; then
48+
git push --set-upstream origin "$BRANCH"
49+
gh pr create --repo PennyLaneAI/pennylane-lightning --title "Daily main sync to master - conflict resolution" --body "" --base master
50+
else
51+
echo "No new changes to sync from main to master."
52+
fi
53+
exit 1

.github/workflows/tests_gpu_cpp.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ on:
55
lightning-version:
66
type: string
77
required: true
8-
description: The version of Lightning to use. Valid values are either 'release' (most recent release candidate), 'stable' (most recent git-tag) or 'latest' (most recent commit from master)
8+
description: The version of Lightning to use. Valid values are either 'release' (most recent release candidate), 'stable' (most recent git-tag) or 'latest' (most recent commit from main)
99
pennylane-version:
1010
type: string
1111
required: true
12-
description: The version of PennyLane to use. Valid values are either 'release' (most recent release candidate), 'stable' (most recent git-tag) or 'latest' (most recent commit from master)
12+
description: The version of PennyLane to use. Valid values are either 'release' (most recent release candidate), 'stable' (most recent git-tag) or 'latest' (most recent commit from main)
1313
pull_request:
1414
types:
1515
- opened
@@ -18,7 +18,7 @@ on:
1818
- ready_for_review
1919
push:
2020
branches:
21-
- master
21+
- main
2222

2323
env:
2424
CI_CUDA_ARCH: 86

.github/workflows/tests_gpu_python.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ on:
55
lightning-version:
66
type: string
77
required: true
8-
description: The version of Lightning to use. Valid values are either 'release' (most recent release candidate), 'stable' (most recent git-tag) or 'latest' (most recent commit from master)
8+
description: The version of Lightning to use. Valid values are either 'release' (most recent release candidate), 'stable' (most recent git-tag) or 'latest' (most recent commit from main)
99
pennylane-version:
1010
type: string
1111
required: true
12-
description: The version of PennyLane to use. Valid values are either 'release' (most recent release candidate), 'stable' (most recent git-tag) or 'latest' (most recent commit from master)
12+
description: The version of PennyLane to use. Valid values are either 'release' (most recent release candidate), 'stable' (most recent git-tag) or 'latest' (most recent commit from main)
1313
pull_request:
1414
types:
1515
- opened
@@ -18,7 +18,7 @@ on:
1818
- ready_for_review
1919
push:
2020
branches:
21-
- master
21+
- main
2222

2323
env:
2424
CI_CUDA_ARCH: 86

0 commit comments

Comments
 (0)