diff --git a/.github/config/gh-ci.toml b/.github/config/gh-ci.toml
index 773edef5a..465b0a0cd 100644
--- a/.github/config/gh-ci.toml
+++ b/.github/config/gh-ci.toml
@@ -5,5 +5,5 @@ endpoint = "https://s3.fr-par.scw.cloud"
[lief.deploy]
branches = ["master", "deploy", "devel"]
-main-branches = ["master", "main"]
+main-branches = ["main", "master"]
default-dir = "latest"
diff --git a/.github/workflows/code-check.yml b/.github/workflows/code-check.yml
index c2f585ed6..16b5b3200 100644
--- a/.github/workflows/code-check.yml
+++ b/.github/workflows/code-check.yml
@@ -4,7 +4,7 @@ on:
inputs:
branch:
description: 'LIEF branch'
- default: master
+ default: main
required: false
type: string
what:
@@ -19,7 +19,7 @@ on:
type: string
push:
branches:
- - master
+ - main
jobs:
coverage:
runs-on: ubuntu-latest
diff --git a/.github/workflows/linux-x86-64.yml b/.github/workflows/linux-x86-64.yml
index 19fe6d3c4..1cb421292 100644
--- a/.github/workflows/linux-x86-64.yml
+++ b/.github/workflows/linux-x86-64.yml
@@ -278,9 +278,9 @@ jobs:
CIRCLE_CI_TOKEN: ${{ secrets.CIRCLE_CI_TOKEN }}
steps:
- name: Trigger documentation
- if: github.ref == 'refs/heads/master'
+ if: github.ref == 'refs/heads/main'
run: |
curl --request POST --url ${CIRCLE_CI_URL} \
--header "Circle-Token: ${CIRCLE_CI_TOKEN}" \
--header 'content-type: application/json' \
- --data '{"parameters":{"lief-branch":"master"}}'
+ --data '{"parameters":{"lief-branch":"main"}}'
diff --git a/.github/workflows/windows-all.yml b/.github/workflows/windows-all.yml
index d8cdc277d..cf6554d0a 100644
--- a/.github/workflows/windows-all.yml
+++ b/.github/workflows/windows-all.yml
@@ -2,6 +2,7 @@ name: LIEF Windows
on:
push:
branches:
+ - 'main'
- 'master'
- 'release-**'
- 'release/**'
diff --git a/.github/workflows/windows-quick.yml b/.github/workflows/windows-quick.yml
index 652bdc9fe..d1f2b964d 100644
--- a/.github/workflows/windows-quick.yml
+++ b/.github/workflows/windows-quick.yml
@@ -4,6 +4,7 @@ on:
branches:
- '**'
- '!master'
+ - '!main'
- '!release-**'
- '!release/**'
tags-ignore:
diff --git a/README.md b/README.md
index b73adba42..e382966fd 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
-
+
@@ -8,27 +8,27 @@
- 
+ 
- 
+ 
- 
+ 
- 
+ 
- 
+ 
- 
+ 
diff --git a/doc/sphinx/changelog.rst b/doc/sphinx/changelog.rst
index f34c4fa68..246bf0117 100644
--- a/doc/sphinx/changelog.rst
+++ b/doc/sphinx/changelog.rst
@@ -4,6 +4,9 @@ Changelog
0.15.0 - Not Released Yet
-------------------------
+:Repo:
+ * ``master`` branch has been renamed ``main``
+
:ELF:
* The ``static_symbols`` API functions has been renamed in ``symtab_symbols``.
diff --git a/doc/sphinx/compilation.rst b/doc/sphinx/compilation.rst
index 8eba8fe29..2647a1031 100644
--- a/doc/sphinx/compilation.rst
+++ b/doc/sphinx/compilation.rst
@@ -215,14 +215,14 @@ Continuous Integration
LIEF uses CI Github Action to test and release nightly builds. The configuration
of this CI can also be a good source of information for the compilation process.
-In particular, `scripts/docker/run_linux_sdk `_
+In particular, `scripts/docker/run_linux_sdk `_
contains the build process to generate the **Linux x86-64 SDK**.
On Windows, the SDK is built with the following Python script:
-`scripts/windows/package_sdk.py `_
+`scripts/windows/package_sdk.py `_
-For **OSX & iOS**, the CI configs `.github/workflows/ios.yml `_
-and `.github/workflows/osx.yml `_
+For **OSX & iOS**, the CI configs `.github/workflows/ios.yml `_
+and `.github/workflows/osx.yml `_
to compile (and cross-compile) LIEF for these platforms.
CMake Options
diff --git a/doc/sphinx/tutorials/09_frida_lief.rst b/doc/sphinx/tutorials/09_frida_lief.rst
index 312e1a34e..f535e429c 100644
--- a/doc/sphinx/tutorials/09_frida_lief.rst
+++ b/doc/sphinx/tutorials/09_frida_lief.rst
@@ -44,7 +44,7 @@ Frida & LIEF
One less known injection technique but quite old is based on modifying the ELF format. It has been well explained by Mayhem in `Phrack `_ [1]_ and LIEF provides a user-friendly API [2]_ to do it.
To summarize, executable formats include libraries that are linked with executable. We can have list of linked libraries with
-``ldd`` or ``readelf`` (Unix) or with `elf_reader.py `_ (Linux, Windows, OSX):
+``ldd`` or ``readelf`` (Unix) or with `elf_reader.py `_ (Linux, Windows, OSX):
.. code-block:: console
diff --git a/doc/sphinx/tutorials/13_pe_authenticode.rst b/doc/sphinx/tutorials/13_pe_authenticode.rst
index a373be56e..735ba3e43 100644
--- a/doc/sphinx/tutorials/13_pe_authenticode.rst
+++ b/doc/sphinx/tutorials/13_pe_authenticode.rst
@@ -186,8 +186,8 @@ Then, we can use ``openssl`` to process its content:
object: undefined (1.3.6.1.4.1.311.2.1.11)
-The `authenticode_reader.py `_
-script located in the `examples/ `_ directory
+The `authenticode_reader.py `_
+script located in the `examples/ `_ directory
can also be used to inspect the signature:
.. code-block:: console
diff --git a/examples/cmake/add_subdirectory/CMakeLists.txt b/examples/cmake/add_subdirectory/CMakeLists.txt
index 8e3d113a2..6b2964c5a 100644
--- a/examples/cmake/add_subdirectory/CMakeLists.txt
+++ b/examples/cmake/add_subdirectory/CMakeLists.txt
@@ -33,7 +33,7 @@ else()
# URL of the LIEF repo (Can be your fork)
set(LIEF_GIT_URL "https://github.com/lief-project/LIEF.git")
- # LIEF's version to be used (can be 'master')
+ # LIEF's version to be used (can be 'main')
set(LIEF_VERSION 0.13.0)
include(FetchContent)
diff --git a/examples/cmake/external_project/CMakeLists.txt b/examples/cmake/external_project/CMakeLists.txt
index 10878fc1d..3dca05426 100644
--- a/examples/cmake/external_project/CMakeLists.txt
+++ b/examples/cmake/external_project/CMakeLists.txt
@@ -12,7 +12,7 @@ set(LIEF_INSTALL_DIR "${LIEF_PREFIX}/install")
# URL of the LIEF repo (Can be your fork)
set(LIEF_GIT_URL "https://github.com/lief-project/LIEF.git")
-# LIEF's version to be used (can be 'master')
+# LIEF's version to be used (can be 'main')
set(LIEF_VERSION 0.13.0)
# LIEF compilation config