Skip to content

Commit

Permalink
BugFix: ManyLinux CI was not setting BuildNumber inside generated bin…
Browse files Browse the repository at this point in the history
…aries

This was due to the Git directory being owned by a different user.
Have pre-emptivley added the fix to other CI runs which perform a CMake configure/build
  • Loading branch information
Robadob authored and ptheywood committed Jan 26, 2023
1 parent cfbe3c3 commit 4fc8a77
Show file tree
Hide file tree
Showing 6 changed files with 35 additions and 0 deletions.
4 changes: 4 additions & 0 deletions .github/workflows/CMake.yml
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,10 @@ jobs:
make
sudo make install
# This pre-emptively patches a bug from ManyLinux where git dir is owned by diff user, blocking buildnumber generation
- name: Enable git safe-directory
run: git config --global --add safe.directory $GITHUB_WORKSPACE

- name: Configure cmake
run: >
cmake . -B "${{ env.BUILD_DIR }}"
Expand Down
16 changes: 16 additions & 0 deletions .github/workflows/Draft-Release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,10 @@ jobs:
make
sudo make install
# This pre-emptively patches a bug where ManyLinux didn't generate buildnumber as git dir was owned by diff user
- name: Enable git safe-directory
run: git config --global --add safe.directory $GITHUB_WORKSPACE

- name: Configure cmake
run: >
cmake . -B "${{ env.BUILD_DIR }}"
Expand Down Expand Up @@ -256,6 +260,10 @@ jobs:
- name: Add custom problem matchers for annotations
run: echo "::add-matcher::.github/problem-matchers.json"

# This pre-emptively patches a bug where ManyLinux didn't generate buildnumber as git dir was owned by diff user
- name: Enable git safe-directory
run: git config --global --add safe.directory $GITHUB_WORKSPACE

# Must pass -G -A for windows, and -DPython3_ROOT_DIR/-DPYTHON3_EXECUTABLE as a github action workaround
- name: Configure cmake
run: >
Expand Down Expand Up @@ -403,6 +411,10 @@ jobs:
make
make install
# This patches a bug where ManyLinux doesn't generate buildnumber as git dir is owned by diff user
- name: Enable git safe-directory
run: git config --global --add safe.directory $GITHUB_WORKSPACE

# Unlike other builds manylinux, uses static glew as it has been built and installed.
- name: Configure cmake
run: >
Expand Down Expand Up @@ -528,6 +540,10 @@ jobs:
- name: Add custom problem matchers for annotations
run: echo "::add-matcher::.github/problem-matchers.json"

# This pre-emptively patches a bug where ManyLinux didn't generate buildnumber as git dir was owned by diff user
- name: Enable git safe-directory
run: git config --global --add safe.directory $GITHUB_WORKSPACE

# Must pass -G -A for windows, and -DPython3_ROOT_DIR/-DPYTHON3_EXECUTABLE as a github action workaround
- name: Configure cmake
run: >
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/Manylinux2014.yml
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,10 @@ jobs:
- name: Add custom problem matchers for annotations
run: echo "::add-matcher::.github/problem-matchers.json"

# This patches a bug where ManyLinux doesn't generate buildnumber as git dir is owned by diff user
- name: Enable git safe-directory
run: git config --global --add safe.directory $GITHUB_WORKSPACE

- name: Configure cmake
run: >
cmake . -B "${{ env.BUILD_DIR }}"
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/Ubuntu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,9 @@ jobs:
- name: Add custom problem matchers for annotations
run: echo "::add-matcher::.github/problem-matchers.json"

# This pre-emptively patches a bug from ManyLinux where git dir is owned by diff user, blocking buildnumber generation
- name: Enable git safe-directory
run: git config --global --add safe.directory $GITHUB_WORKSPACE

- name: Configure cmake
run: >
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/Windows-Tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,10 @@ jobs:
- name: Add custom problem matchers for annotations
run: echo "::add-matcher::.github/problem-matchers.json"

# This pre-emptively patches a bug from ManyLinux where git dir is owned by diff user, blocking buildnumber generation
- name: Enable git safe-directory
run: git config --global --add safe.directory $GITHUB_WORKSPACE

# Must pass -G -A for windows, and -DPython3_ROOT_DIR/-DPYTHON3_EXECUTABLE as a github action workaround
- name: Configure cmake
run: >
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/Windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,10 @@ jobs:
- name: Add custom problem matchers for annotations
run: echo "::add-matcher::.github/problem-matchers.json"

# This pre-emptively patches a bug from ManyLinux where git dir is owned by diff user, blocking buildnumber generation
- name: Enable git safe-directory
run: git config --global --add safe.directory $GITHUB_WORKSPACE

# Must pass -G -A for windows, and -DPython3_ROOT_DIR/-DPYTHON3_EXECUTABLE as a github action workaround
- name: Configure cmake
run: >
Expand Down

0 comments on commit 4fc8a77

Please sign in to comment.