Skip to content
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.

Sign up for GitHub

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

Remove checking out main #1117

Merged
merged 2 commits into from
Oct 17, 2024
Merged

Remove checking out main #1117

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
08f7106
Remove checking out main
jonathanKingston Oct 17, 2024
daf2ff4
Account for both branches existing or not
jonathanKingston Oct 17, 2024
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
3 changes: 2 additions & 1 deletion .github/scripts/diff-directories.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,8 @@ function displayDiffs (dir1Files, dir2Files, isOpen) {
}
const outString = Object.keys(rollupGrouping).map(key => {
const rollup = rollupGrouping[key]
let outString = ''
let outString = `
`
let title = key
if (rollup.files.length) {
for (const file of rollup.files) {
Expand Down
15 changes: 13 additions & 2 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,19 @@ jobs:
- name: Fetch files and checkout
run: |
git fetch origin
git checkout -b main origin/main
git checkout -b releases origin/releases
# Check if the 'main' branch exists, if not, create it
if git rev-parse --verify main >/dev/null 2>&1; then
git checkout main
else
git checkout -b main origin/main
fi
# Check if the 'releases' branch exists, if not, create it
if git rev-parse --verify releases >/dev/null 2>&1; then
git checkout releases
else
git checkout -b releases origin/releases
fi
# Checkout the code of main onto releases
git checkout main -- .

- name: Build release
Expand Down
Loading