Skip to content

Commit

Permalink
Rename master branch into main
Browse files Browse the repository at this point in the history
  • Loading branch information
romainthomas committed Apr 27, 2024
1 parent 54d0a72 commit 6d1a230
Show file tree
Hide file tree
Showing 12 changed files with 26 additions and 21 deletions.
2 changes: 1 addition & 1 deletion .github/config/gh-ci.toml
Expand Up @@ -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"
4 changes: 2 additions & 2 deletions .github/workflows/code-check.yml
Expand Up @@ -4,7 +4,7 @@ on:
inputs:
branch:
description: 'LIEF branch'
default: master
default: main
required: false
type: string
what:
Expand All @@ -19,7 +19,7 @@ on:
type: string
push:
branches:
- master
- main
jobs:
coverage:
runs-on: ubuntu-latest
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/linux-x86-64.yml
Expand Up @@ -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"}}'
1 change: 1 addition & 0 deletions .github/workflows/windows-all.yml
Expand Up @@ -2,6 +2,7 @@ name: LIEF Windows
on:
push:
branches:
- 'main'
- 'master'
- 'release-**'
- 'release/**'
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/windows-quick.yml
Expand Up @@ -4,6 +4,7 @@ on:
branches:
- '**'
- '!master'
- '!main'
- '!release-**'
- '!release/**'
tags-ignore:
Expand Down
14 changes: 7 additions & 7 deletions README.md
@@ -1,5 +1,5 @@
<p align="center" >
<img width="90%" src="https://github.com/lief-project/LIEF/blob/master/.github/images/architecture.png"/><br />
<img width="90%" src="https://github.com/lief-project/LIEF/blob/main/.github/images/architecture.png"/><br />
</p>

<p align="center">
Expand All @@ -8,27 +8,27 @@
</a>
&nbsp;
<a href="https://github.com/lief-project/LIEF/actions/workflows/linux-x86-64.yml">
<img alt="Linux x86-64 CI status" src="https://img.shields.io/github/actions/workflow/status/lief-project/LIEF/linux-x86-64.yml?branch=master&label=Linux%20x86-64&logo=github">
<img alt="Linux x86-64 CI status" src="https://img.shields.io/github/actions/workflow/status/lief-project/LIEF/linux-x86-64.yml?branch=main&label=Linux%20x86-64&logo=github">
</a>
&nbsp;
<a href="https://github.com/lief-project/LIEF/actions/workflows/linux-aarch64.yml">
<img alt="Linux AArch64 CI status" src="https://img.shields.io/github/actions/workflow/status/lief-project/LIEF/linux-aarch64.yml?branch=master&label=Linux%20AArch64&logo=github">
<img alt="Linux AArch64 CI status" src="https://img.shields.io/github/actions/workflow/status/lief-project/LIEF/linux-aarch64.yml?branch=main&label=Linux%20AArch64&logo=github">
</a>
&nbsp;
<a href="https://github.com/lief-project/LIEF/actions/workflows/android.yml">
<img alt="Android CI status" src="https://img.shields.io/github/actions/workflow/status/lief-project/LIEF/android.yml?branch=master&label=Android&logo=github">
<img alt="Android CI status" src="https://img.shields.io/github/actions/workflow/status/lief-project/LIEF/android.yml?branch=main&label=Android&logo=github">
</a>
&nbsp;
<a href="https://github.com/lief-project/LIEF/actions/workflows/osx.yml">
<img alt="macOS CI status" src="https://img.shields.io/github/actions/workflow/status/lief-project/LIEF/osx.yml?branch=master&label=macOS&logo=github">
<img alt="macOS CI status" src="https://img.shields.io/github/actions/workflow/status/lief-project/LIEF/osx.yml?branch=main&label=macOS&logo=github">
</a>
&nbsp;
<a href="https://github.com/lief-project/LIEF/actions/workflows/ios.yml">
<img alt="iOS CI status" src="https://img.shields.io/github/actions/workflow/status/lief-project/LIEF/ios.yml?branch=master&label=iOS&logo=github">
<img alt="iOS CI status" src="https://img.shields.io/github/actions/workflow/status/lief-project/LIEF/ios.yml?branch=main&label=iOS&logo=github">
</a>
&nbsp;
<a href="https://github.com/lief-project/LIEF/actions/workflows/windows-all.yml">
<img alt="Windows CI status" src="https://img.shields.io/github/actions/workflow/status/lief-project/LIEF/windows-all.yml?branch=master&label=Windows&logo=github">
<img alt="Windows CI status" src="https://img.shields.io/github/actions/workflow/status/lief-project/LIEF/windows-all.yml?branch=main&label=Windows&logo=github">
</a>
&nbsp;
<a href="https://github.com/lief-project/LIEF/releases">
Expand Down
3 changes: 3 additions & 0 deletions doc/sphinx/changelog.rst
Expand Up @@ -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``.

Expand Down
8 changes: 4 additions & 4 deletions doc/sphinx/compilation.rst
Expand Up @@ -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 <https://github.com/lief-project/LIEF/blob/master/scripts/docker/run_linux_sdk.sh>`_
In particular, `scripts/docker/run_linux_sdk <https://github.com/lief-project/LIEF/blob/main/scripts/docker/run_linux_sdk.sh>`_
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 <https://github.com/lief-project/LIEF/blob/master/scripts/windows/package_sdk.py>`_
`scripts/windows/package_sdk.py <https://github.com/lief-project/LIEF/blob/main/scripts/windows/package_sdk.py>`_

For **OSX & iOS**, the CI configs `.github/workflows/ios.yml <https://github.com/lief-project/LIEF/blob/master/.github/workflows/ios.yml>`_
and `.github/workflows/osx.yml <https://github.com/lief-project/LIEF/blob/master/.github/workflows/osx.yml>`_
For **OSX & iOS**, the CI configs `.github/workflows/ios.yml <https://github.com/lief-project/LIEF/blob/main/.github/workflows/ios.yml>`_
and `.github/workflows/osx.yml <https://github.com/lief-project/LIEF/blob/main/.github/workflows/osx.yml>`_
to compile (and cross-compile) LIEF for these platforms.

CMake Options
Expand Down
2 changes: 1 addition & 1 deletion doc/sphinx/tutorials/09_frida_lief.rst
Expand Up @@ -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 <http://phrack.org/issues/61/8.html>`_ [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 <https://github.com/lief-project/LIEF/blob/master/examples/python/elf_reader.py>`_ (Linux, Windows, OSX):
``ldd`` or ``readelf`` (Unix) or with `elf_reader.py <https://github.com/lief-project/LIEF/blob/main/examples/python/elf_reader.py>`_ (Linux, Windows, OSX):

.. code-block:: console
Expand Down
4 changes: 2 additions & 2 deletions doc/sphinx/tutorials/13_pe_authenticode.rst
Expand Up @@ -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 <https://github.com/lief-project/LIEF/blob/master/examples/python/authenticode/authenticode_reader.py>`_
script located in the `examples/ <https://github.com/lief-project/LIEF/tree/master/examples/python/authenticode>`_ directory
The `authenticode_reader.py <https://github.com/lief-project/LIEF/blob/main/examples/python/authenticode/authenticode_reader.py>`_
script located in the `examples/ <https://github.com/lief-project/LIEF/tree/main/examples/python/authenticode>`_ directory
can also be used to inspect the signature:

.. code-block:: console
Expand Down
2 changes: 1 addition & 1 deletion examples/cmake/add_subdirectory/CMakeLists.txt
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion examples/cmake/external_project/CMakeLists.txt
Expand Up @@ -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
Expand Down

0 comments on commit 6d1a230

Please sign in to comment.