Skip to content

Commit b488451

Browse files
authored
Merge pull request #2960 from flatcar/update-documentation-branch-names
Update documentation and ebuilds to reference `main` branch instead `flatcar-master` This pull request updates references from the `flatcar-master` branch to the `main` branch across various files and documentation. The changes ensure consistency with the updated branch naming convention. ### Documentation updates: * Updated the link to `kola` in `PREFIX.md` to reference the `main` branch instead of `flatcar-master`. * Updated the link to `kola` in `ci-automation/README.md` to reference the `main` branch instead of `flatcar-master`. ### Ebuild file updates: * Changed the `EGIT_COMMIT` comment in `toolbox-9999.ebuild` to reference `main` instead of `flatcar-master`. * Changed the `EGIT_COMMIT` comment in `update-ssh-keys-9999.ebuild` to reference `main` instead of `flatcar-master`. * Changed the `EGIT_COMMIT` comment in `nss-usrfiles-9999.ebuild` to reference `main` instead of `flatcar-master`. This is in reference to this issue: flatcar/Flatcar#1714
2 parents e765375 + b0ccb6f commit b488451

File tree

5 files changed

+5
-5
lines changed

5 files changed

+5
-5
lines changed

PREFIX.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Before prefix build support are considered stable, the below must be implemented
1212
Prefix builds currently use the SDK cross toolchains (`/usr/<arch>-gnu/`) instead of board toolchains in `/build/<board>`.
1313
Prefix builds must be integrated with the board toolchains and stop using `cb-emerge` before considered stable.
1414
3. Add prefix wrappers for all portage tools (similar to board wrappers), not just `emerge`.
15-
4. Add test cases for prefix builds to [mantle/kola](https://github.com/flatcar/mantle/tree/flatcar-master/kola).
15+
4. Add test cases for prefix builds to [mantle/kola](https://github.com/flatcar/mantle/tree/main/kola).
1616

1717
## About
1818

ci-automation/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ Optionally, patterns matching a group of tests can be supplied (or simply a list
125125

126126
Testing is implemented in two layers:
127127
1. `ci-automation/test.sh` is a generic test wrapper / stub to be called from CI.
128-
2. `ci-automation/vendor-testing/` contains low-level vendor-specific test wrappers around [`kola`](https://github.com/flatcar/mantle/tree/flatcar-master/kola/), our test scenario orchestrator.
128+
2. `ci-automation/vendor-testing/` contains low-level vendor-specific test wrappers around [`kola`](https://github.com/flatcar/mantle/tree/main/kola/), our test scenario orchestrator.
129129

130130
Testing relies on the SDK container and will use tools / test suites from the SDK.
131131
The low-level vendor / image specific script (layer 2. in the list above) runs inside the SDK.

sdk_container/src/third_party/coreos-overlay/app-admin/toolbox/toolbox-9999.ebuild

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ EGIT_REPO_URI="https://github.com/flatcar/toolbox.git"
77
if [[ "${PV}" == 9999 ]]; then
88
KEYWORDS="~amd64 ~arm64"
99
else
10-
EGIT_COMMIT="fce9ba2bbd55e1835af72952bfbb7aed6be75606" # flatcar-master
10+
EGIT_COMMIT="fce9ba2bbd55e1835af72952bfbb7aed6be75606" # main
1111
KEYWORDS="amd64 arm64"
1212
fi
1313

sdk_container/src/third_party/coreos-overlay/coreos-base/update-ssh-keys/update-ssh-keys-9999.ebuild

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ if [[ ${PV} == 9999 ]]; then
99
KEYWORDS="~amd64 ~arm64"
1010
CRATES=""
1111
else
12-
EGIT_COMMIT="be3ce2acc50313a6826c578e9dbb67e17085d60d" # flatcar-master
12+
EGIT_COMMIT="be3ce2acc50313a6826c578e9dbb67e17085d60d" # main
1313
KEYWORDS="amd64 arm64"
1414

1515
CRATES="

sdk_container/src/third_party/coreos-overlay/sys-libs/nss-usrfiles/nss-usrfiles-9999.ebuild

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ EGIT_REPO_URI="https://github.com/flatcar/nss-altfiles.git"
77
if [[ "${PV}" == 9999 ]]; then
88
KEYWORDS="~amd64 ~arm ~arm64 ~x86"
99
else
10-
EGIT_COMMIT="c8e05a08a2e28eb48c6c788e3007d94f8d8de5cd" # flatcar-master
10+
EGIT_COMMIT="c8e05a08a2e28eb48c6c788e3007d94f8d8de5cd" # main
1111
KEYWORDS="amd64 arm arm64 x86"
1212
fi
1313

0 commit comments

Comments
 (0)