mirror of
https://github.com/google/cpu_features.git
synced 2025-04-27 15:12:30 +02:00
Rename 'master' branch into 'main' (#219)
This commit is contained in:
parent
149916384b
commit
2f5a7bf80a
4
.github/workflows/clang_format.yml
vendored
4
.github/workflows/clang_format.yml
vendored
@ -8,8 +8,8 @@ jobs:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
- name: Fetch origin/master
|
||||
run: git fetch origin master
|
||||
- name: Fetch origin/main
|
||||
run: git fetch origin main
|
||||
- name: List of changed file(s)
|
||||
run: git diff --name-only FETCH_HEAD
|
||||
|
||||
|
@ -3,11 +3,11 @@
|
||||
[![Macos Status][macos_svg]][macos_link]
|
||||
[![Windows Status][windows_svg]][windows_link]
|
||||
|
||||
[linux_svg]: https://github.com/google/cpu_features/actions/workflows/amd64_linux.yml/badge.svg?branch=master
|
||||
[linux_svg]: https://github.com/google/cpu_features/actions/workflows/amd64_linux.yml/badge.svg?branch=main
|
||||
[linux_link]: https://github.com/google/cpu_features/actions/workflows/amd64_linux.yml
|
||||
[macos_svg]: https://github.com/google/cpu_features/actions/workflows/amd64_macos.yml/badge.svg?branch=master
|
||||
[macos_svg]: https://github.com/google/cpu_features/actions/workflows/amd64_macos.yml/badge.svg?branch=main
|
||||
[macos_link]: https://github.com/google/cpu_features/actions/workflows/amd64_macos.yml
|
||||
[windows_svg]: https://github.com/google/cpu_features/actions/workflows/amd64_windows.yml/badge.svg?branch=master
|
||||
[windows_svg]: https://github.com/google/cpu_features/actions/workflows/amd64_windows.yml/badge.svg?branch=main
|
||||
[windows_link]: https://github.com/google/cpu_features/actions/workflows/amd64_windows.yml
|
||||
|
||||
A cross-platform C library to retrieve CPU features (such as available
|
||||
@ -179,7 +179,7 @@ flags : aes,avx,cx16,smx,sse4_1,sse4_2,ssse3
|
||||
## Android NDK's drop in replacement
|
||||
|
||||
[cpu_features](https://github.com/google/cpu_features) is now officially
|
||||
supporting Android and offers a drop in replacement of for the NDK's [cpu-features.h](https://android.googlesource.com/platform/ndk/+/master/sources/android/cpufeatures/cpu-features.h)
|
||||
supporting Android and offers a drop in replacement of for the NDK's [cpu-features.h](https://android.googlesource.com/platform/ndk/+/main/sources/android/cpufeatures/cpu-features.h)
|
||||
, see [ndk_compat](ndk_compat) folder for details.
|
||||
|
||||
<a name="license"></a>
|
||||
|
14
ci/README.md
14
ci/README.md
@ -6,22 +6,22 @@
|
||||
| MacOS | [![Status][macos_svg]][macos_link] | N/A | N/A | N/A |
|
||||
| Windows | [![Status][windows_svg]][windows_link] | N/A | N/A | N/A |
|
||||
|
||||
[freebsd_svg]: https://github.com/google/cpu_features/actions/workflows/amd64_freebsd.yml/badge.svg?branch=master
|
||||
[freebsd_svg]: https://github.com/google/cpu_features/actions/workflows/amd64_freebsd.yml/badge.svg?branch=main
|
||||
[freebsd_link]: https://github.com/google/cpu_features/actions/workflows/amd64_freebsd.yml
|
||||
|
||||
[linux_svg]: https://github.com/google/cpu_features/actions/workflows/amd64_linux.yml/badge.svg?branch=master
|
||||
[linux_svg]: https://github.com/google/cpu_features/actions/workflows/amd64_linux.yml/badge.svg?branch=main
|
||||
[linux_link]: https://github.com/google/cpu_features/actions/workflows/amd64_linux.yml
|
||||
[linux_aarch64_svg]: https://github.com/google/cpu_features/actions/workflows/aarch64_linux.yml/badge.svg?branch=master
|
||||
[linux_aarch64_svg]: https://github.com/google/cpu_features/actions/workflows/aarch64_linux.yml/badge.svg?branch=main
|
||||
[linux_aarch64_link]: https://github.com/google/cpu_features/actions/workflows/aarch64_linux.yml
|
||||
[linux_arm_svg]: https://github.com/google/cpu_features/actions/workflows/arm_linux.yml/badge.svg?branch=master
|
||||
[linux_arm_svg]: https://github.com/google/cpu_features/actions/workflows/arm_linux.yml/badge.svg?branch=main
|
||||
[linux_arm_link]: https://github.com/google/cpu_features/actions/workflows/arm_linux.yml
|
||||
[linux_mips_svg]: https://github.com/google/cpu_features/actions/workflows/mips_linux.yml/badge.svg?branch=master
|
||||
[linux_mips_svg]: https://github.com/google/cpu_features/actions/workflows/mips_linux.yml/badge.svg?branch=main
|
||||
[linux_mips_link]: https://github.com/google/cpu_features/actions/workflows/mips_linux.yml
|
||||
|
||||
[macos_svg]: https://github.com/google/cpu_features/actions/workflows/amd64_macos.yml/badge.svg?branch=master
|
||||
[macos_svg]: https://github.com/google/cpu_features/actions/workflows/amd64_macos.yml/badge.svg?branch=main
|
||||
[macos_link]: https://github.com/google/cpu_features/actions/workflows/amd64_macos.yml
|
||||
|
||||
[windows_svg]: https://github.com/google/cpu_features/actions/workflows/amd64_windows.yml/badge.svg?branch=master
|
||||
[windows_svg]: https://github.com/google/cpu_features/actions/workflows/amd64_windows.yml/badge.svg?branch=main
|
||||
[windows_link]: https://github.com/google/cpu_features/actions/workflows/amd64_windows.yml
|
||||
|
||||
## Makefile/Docker testing
|
||||
|
@ -6,7 +6,7 @@ For API / ABI compatibility reasons, it is recommended to build and use
|
||||
cpu_features in a subdirectory of your project or as an embedded dependency.
|
||||
|
||||
This is similar to the recommended usage of the googletest framework
|
||||
( https://github.com/google/googletest/blob/master/googletest/README.md )
|
||||
( https://github.com/google/googletest/blob/main/googletest/README.md )
|
||||
|
||||
Build and use step-by-step
|
||||
|
||||
|
@ -19,16 +19,16 @@ declare -r VERSION=$1
|
||||
declare -r GIT_TAG="v$1"
|
||||
|
||||
BRANCH=$(git rev-parse --abbrev-ref HEAD)
|
||||
if [[ "${BRANCH}" != "master" ]]
|
||||
if [[ "${BRANCH}" != "main" ]]
|
||||
then
|
||||
echo -e "${ERROR}Not on master. Aborting. ${NOCOLOR}"
|
||||
echo -e "${ERROR}Not on main. Aborting. ${NOCOLOR}"
|
||||
echo
|
||||
exit 1
|
||||
fi
|
||||
|
||||
git fetch
|
||||
HEADHASH=$(git rev-parse HEAD)
|
||||
UPSTREAMHASH=$(git rev-parse master@{upstream})
|
||||
UPSTREAMHASH=$(git rev-parse main@{upstream})
|
||||
|
||||
if [[ "${HEADHASH}" != "${UPSTREAMHASH}" ]]
|
||||
then
|
||||
|
Loading…
x
Reference in New Issue
Block a user