Skip to content

Commit b3d09be

Browse files
authored
Rename main branch (#251)
1 parent 57c763a commit b3d09be

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

.github/workflows/ci.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on:
44
pull_request:
55
push:
66
branches:
7-
- master
7+
- main
88

99
jobs:
1010
build:
@@ -57,7 +57,7 @@ jobs:
5757
# Node.js version. Thus, we have to checkout the code manually.
5858
# Doing so is a bit tricky when it comes to PRs from forks (see #249 for details). The general idea here is that
5959
# we access Github's context information for the event triggering the action's execution and use some details on
60-
# the PR's HEAD if given. Otherwise (for executions due to master updates), we still use the provided
60+
# the PR's HEAD if given. Otherwise (for executions due to main branch updates), we still use the provided
6161
# environment variables.
6262
run: |
6363
apt-get update

README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
C++ SQL Parser
22
=========================
3-
[![Build Status](https://github.com/hyrise/sql-parser/actions/workflows/ci.yml/badge.svg?branch=master)](https://github.com/hyrise/sql-parser/actions?query=branch%3Amaster)
3+
[![Build Status](https://github.com/hyrise/sql-parser/actions/workflows/ci.yml/badge.svg?branch=main)](https://github.com/hyrise/sql-parser/actions?query=branch%3Amain)
44

55

66
This is a SQL Parser for C++. It parses the given SQL query into C++ objects.
@@ -20,7 +20,7 @@ To use the SQL parser in your own projects you simply have to follow these few s
2020
3. *(Optional, Recommended)* Run `make install` to copy the library to `/usr/local/lib/`
2121
4. Run the tests `make test` to make sure everything worked
2222
5. Include the `SQLParser.h` from `src/` (or from `/usr/local/lib/hsql/` if you installed it) and link the library in your project
23-
6. Take a look at the [example project here](https://github.com/hyrise/sql-parser/tree/master/example)
23+
6. Take a look at the [example project here](https://github.com/hyrise/sql-parser/tree/main/example)
2424

2525
```cpp
2626
#include "hsql/SQLParser.h"

format.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,6 @@ elif [ "$1" = "staged" ]; then
1919
# Run on all files that are staged to be committed.
2020
git diff --diff-filter=d --cached --name-only | grep -E "$source_regex" | xargs -I{} sh -c "${format_cmd}"
2121
else
22-
# Run on all changed as well as untracked cpp/hpp files, as compared to the current master. Skip deleted files.
23-
{ git diff --diff-filter=d --name-only master & git ls-files --others --exclude-standard; } | grep -E "$source_regex" | xargs -I{} sh -c "${format_cmd}"
22+
# Run on all changed as well as untracked cpp/hpp files, as compared to the current main. Skip deleted files.
23+
{ git diff --diff-filter=d --name-only main & git ls-files --others --exclude-standard; } | grep -E "$source_regex" | xargs -I{} sh -c "${format_cmd}"
2424
fi

0 commit comments

Comments
 (0)