Move to main over master (#1642)

Resolves https://github.com/PhotonVision/photonvision/issues/251

---------

Signed-off-by: Jade Turner <spacey-sooty@proton.me>
This commit is contained in:
Jade
2024-12-21 01:24:52 +08:00
committed by GitHub
parent 81076375b8
commit ffc4e06ac6
16 changed files with 28 additions and 28 deletions

View File

@@ -1,13 +1,13 @@
name: Lint and Format
on:
# Run on pushes to master and pushed tags, and on pull requests against master, but ignore the docs folder
# Run on pushes to main and pushed tags, and on pull requests against main, but ignore the docs folder
push:
branches: [ master ]
branches: [ main ]
tags:
- 'v*'
pull_request:
branches: [ master ]
branches: [ main ]
merge_group:
concurrency:
@@ -24,7 +24,7 @@ jobs:
run: |
git fetch --prune --unshallow
git checkout -b pr
git branch -f master origin/master
git branch -f main origin/main
- name: Set up Python 3.8
uses: actions/setup-python@v4
with:
@@ -84,6 +84,6 @@ jobs:
run: |
git fetch --prune --unshallow
git checkout -b pr
git branch -f master origin/master
git branch -f main origin/main
- name: Check index.html not changed
run: git --no-pager diff --exit-code origin/master photon-server/src/main/resources/web/index.html
run: git --no-pager diff --exit-code origin/main photon-server/src/main/resources/web/index.html