Skip to content

Re-work image generation #100

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
knoepfel merged 3 commits into from
Nov 10, 2025
Merged

Re-work image generation #100

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f659d59
Re-work image generation
greenc-FNAL Nov 7, 2025
c226e7a
Use `entrypoint.sh` from container root, not from checked-out source
greenc-FNAL Nov 8, 2025
2aba2ef
Restore omitted comment re excluding external Python
greenc-FNAL Nov 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/actions/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ jobs:

- name: Run tests
run: |
. $GITHUB_WORKSPACE/phlex-src/ci/entrypoint.sh
. /entrypoint.sh
cd $GITHUB_WORKSPACE/phlex-build
ctest -j $(nproc)
```
Expand Down
4 changes: 2 additions & 2 deletions .github/actions/REFACTORING_SUMMARY.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ Refactored GitHub Actions workflows to use composite actions for better maintain

**Location**: `.github/actions/setup-build-env/action.yaml`

**Purpose**: Sets up the build environment by sourcing entrypoint script and creating directories
**Purpose**: Sets up the build environment by sourcing the container entrypoint script and creating directories

**Provides**:

- Sources `ci/entrypoint.sh`
- Sources `/entrypoint.sh`
- Creates build directory
- Outputs source and build directory paths

Expand Down
4 changes: 2 additions & 2 deletions .github/actions/build-cmake/action.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ runs:
steps:
- shell: bash
run: |
# Source the entrypoint script
. "$GITHUB_WORKSPACE/$SOURCE_PATH/ci/entrypoint.sh"
# Source the container entrypoint script
. /entrypoint.sh

cd "$GITHUB_WORKSPACE/$BUILD_PATH"

Expand Down
4 changes: 2 additions & 2 deletions .github/actions/configure-cmake/action.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@ runs:
steps:
- shell: bash
run: |
# Source the entrypoint script
. "$GITHUB_WORKSPACE/$SOURCE_PATH/ci/entrypoint.sh"
# Source the container entrypoint script
. /entrypoint.sh
cd "$GITHUB_WORKSPACE/$BUILD_PATH"
SOURCE_DIR="$GITHUB_WORKSPACE/$SOURCE_PATH"
echo "Configuring with CMake preset: $PRESET"
Expand Down
4 changes: 2 additions & 2 deletions .github/actions/setup-build-env/action.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ runs:
- id: setup
shell: bash
run: |
# Source the entrypoint script
. "$GITHUB_WORKSPACE/$SOURCE_PATH/ci/entrypoint.sh"
# Source the container entrypoint script
. /entrypoint.sh

# Create and export build directory
mkdir -p "$GITHUB_WORKSPACE/$BUILD_PATH"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/clang-tidy-check.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ jobs:
PHLEX_TIDY_CHECKS: ${{ needs.check_comment_trigger.outputs.tidy_checks }}
shell: bash
run: |
. $GITHUB_WORKSPACE/phlex-src/ci/entrypoint.sh
. /entrypoint.sh
cd $GITHUB_WORKSPACE/phlex-build

echo "Running clang-tidy checks using CMake target..."
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/clang-tidy-fix.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ jobs:
env:
PHLEX_TIDY_CHECKS: ${{ needs.check.outputs.tidy_checks }}
run: |
. $GITHUB_WORKSPACE/phlex-src/ci/entrypoint.sh
. /entrypoint.sh
cd $GITHUB_WORKSPACE/phlex-build

echo "Applying clang-tidy fixes using CMake target..."
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cmake-build.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,6 @@ jobs:

- name: Test
run: |
. $GITHUB_WORKSPACE/phlex-src/ci/entrypoint.sh
. /entrypoint.sh
cd $GITHUB_WORKSPACE/phlex-build
ctest -j $(nproc)
2 changes: 1 addition & 1 deletion .github/workflows/codeql-analysis.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ jobs:

- name: Test
run: |
. $GITHUB_WORKSPACE/phlex-src/ci/entrypoint.sh
. /entrypoint.sh
cd $GITHUB_WORKSPACE/phlex-build
ctest -j $(nproc) || true

Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/coverage.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ jobs:

- name: Run tests with coverage
run: |
. $GITHUB_WORKSPACE/phlex-src/ci/entrypoint.sh
. /entrypoint.sh
cd $GITHUB_WORKSPACE/phlex-build
PROFILE_ROOT="$GITHUB_WORKSPACE/phlex-build/test/profraw"
echo "Cleaning LLVM profile directory: $PROFILE_ROOT"
Expand All @@ -170,7 +170,7 @@ jobs:
if: ${{ steps.coverage_options.outputs.compiler == 'gcc' }}
shell: bash
run: |
. $GITHUB_WORKSPACE/phlex-src/ci/entrypoint.sh
. /entrypoint.sh
cd $GITHUB_WORKSPACE/phlex-build
echo "Using GCC/gcovr/lcov bundled coverage target."
cmake --build . --target coverage-gcov -v
Expand Down Expand Up @@ -198,7 +198,7 @@ jobs:
if: ${{ steps.coverage_options.outputs.compiler == 'clang' }}
shell: bash
run: |
. $GITHUB_WORKSPACE/phlex-src/ci/entrypoint.sh
. /entrypoint.sh
cd $GITHUB_WORKSPACE/phlex-build
echo "Using Clang/llvm-cov coverage targets."
cmake --build . --target coverage-llvm -v
Expand Down
Loading
Loading