johann/cpu_features
1
0
Fork 0
mirror of https://github.com/google/cpu_features.git synced 2025-04-27 23:22:31 +02:00
Code Issues Releases Wiki Activity

Rename 'master' branch into 'main' (#219)

Browse Source
This commit is contained in:
Guillaume Chatelet 2022-01-24 16:01:45 +01:00 committed by GitHub
parent 149916384b
commit 2f5a7bf80a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/clang_format.yml vendored
View File

@ -8,8 +8,8 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- name: Fetch origin/master - name: Fetch origin/main
run: git fetch origin master run: git fetch origin main
- name: List of changed file(s) - name: List of changed file(s)
run: git diff --name-only FETCH_HEAD run: git diff --name-only FETCH_HEAD

8
README.md
View File

@ -3,11 +3,11 @@
[![Macos Status][macos_svg]][macos_link] [![Macos Status][macos_svg]][macos_link]
[![Windows Status][windows_svg]][windows_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 [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 [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 [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 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 ## Android NDK's drop in replacement
[cpu_features](https://github.com/google/cpu_features) is now officially [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. , see [ndk_compat](ndk_compat) folder for details.
<a name="license"></a> <a name="license"></a>

14
ci/README.md
View File

@ -6,22 +6,22 @@
| MacOS | [![Status][macos_svg]][macos_link] | N/A | N/A | N/A | | MacOS | [![Status][macos_svg]][macos_link] | N/A | N/A | N/A |
| Windows | [![Status][windows_svg]][windows_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 [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_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_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_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 [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 [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 [windows_link]: https://github.com/google/cpu_features/actions/workflows/amd64_windows.yml
## Makefile/Docker testing ## Makefile/Docker testing

2
cmake/README.md
View File

@ -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. cpu_features in a subdirectory of your project or as an embedded dependency.
This is similar to the recommended usage of the googletest framework 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 Build and use step-by-step

6
scripts/make_release.sh
View File

@ -19,16 +19,16 @@ declare -r VERSION=$1
declare -r GIT_TAG="v$1" declare -r GIT_TAG="v$1"
BRANCH=$(git rev-parse --abbrev-ref HEAD) BRANCH=$(git rev-parse --abbrev-ref HEAD)
if [[ "${BRANCH}" != "master" ]] if [[ "${BRANCH}" != "main" ]]
then then
echo -e "${ERROR}Not on master. Aborting. ${NOCOLOR}" echo -e "${ERROR}Not on main. Aborting. ${NOCOLOR}"
echo echo
exit 1 exit 1
fi fi
git fetch git fetch
HEADHASH=$(git rev-parse HEAD) HEADHASH=$(git rev-parse HEAD)
UPSTREAMHASH=$(git rev-parse master@{upstream}) UPSTREAMHASH=$(git rev-parse main@{upstream})
if [[ "${HEADHASH}" != "${UPSTREAMHASH}" ]] if [[ "${HEADHASH}" != "${UPSTREAMHASH}" ]]
then then