Skip to content

Commit 9869e6b

Browse files
authored
Re-work image generation (#100)
* Re-work image generation Specify repo locations * Use `entrypoint.sh` from container root, not from checked-out source * Restore omitted comment re excluding external Python
1 parent 5396444 commit 9869e6b

File tree

12 files changed

+308
-146
lines changed

12 files changed

+308
-146
lines changed

.github/actions/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ jobs:
109109
110110
- name: Run tests
111111
run: |
112-
. $GITHUB_WORKSPACE/phlex-src/ci/entrypoint.sh
112+
. /entrypoint.sh
113113
cd $GITHUB_WORKSPACE/phlex-build
114114
ctest -j $(nproc)
115115
```

.github/actions/REFACTORING_SUMMARY.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ Refactored GitHub Actions workflows to use composite actions for better maintain
1010

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

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

1515
**Provides**:
1616

17-
- Sources `ci/entrypoint.sh`
17+
- Sources `/entrypoint.sh`
1818
- Creates build directory
1919
- Outputs source and build directory paths
2020

.github/actions/build-cmake/action.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ runs:
2424
steps:
2525
- shell: bash
2626
run: |
27-
# Source the entrypoint script
28-
. "$GITHUB_WORKSPACE/$SOURCE_PATH/ci/entrypoint.sh"
27+
# Source the container entrypoint script
28+
. /entrypoint.sh
2929
3030
cd "$GITHUB_WORKSPACE/$BUILD_PATH"
3131

.github/actions/configure-cmake/action.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ runs:
4444
steps:
4545
- shell: bash
4646
run: |
47-
# Source the entrypoint script
48-
. "$GITHUB_WORKSPACE/$SOURCE_PATH/ci/entrypoint.sh"
47+
# Source the container entrypoint script
48+
. /entrypoint.sh
4949
cd "$GITHUB_WORKSPACE/$BUILD_PATH"
5050
SOURCE_DIR="$GITHUB_WORKSPACE/$SOURCE_PATH"
5151
echo "Configuring with CMake preset: $PRESET"

.github/actions/setup-build-env/action.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ runs:
2525
- id: setup
2626
shell: bash
2727
run: |
28-
# Source the entrypoint script
29-
. "$GITHUB_WORKSPACE/$SOURCE_PATH/ci/entrypoint.sh"
28+
# Source the container entrypoint script
29+
. /entrypoint.sh
3030
3131
# Create and export build directory
3232
mkdir -p "$GITHUB_WORKSPACE/$BUILD_PATH"

.github/workflows/clang-tidy-check.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ jobs:
125125
PHLEX_TIDY_CHECKS: ${{ needs.check_comment_trigger.outputs.tidy_checks }}
126126
shell: bash
127127
run: |
128-
. $GITHUB_WORKSPACE/phlex-src/ci/entrypoint.sh
128+
. /entrypoint.sh
129129
cd $GITHUB_WORKSPACE/phlex-build
130130
131131
echo "Running clang-tidy checks using CMake target..."

.github/workflows/clang-tidy-fix.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ jobs:
7878
env:
7979
PHLEX_TIDY_CHECKS: ${{ needs.check.outputs.tidy_checks }}
8080
run: |
81-
. $GITHUB_WORKSPACE/phlex-src/ci/entrypoint.sh
81+
. /entrypoint.sh
8282
cd $GITHUB_WORKSPACE/phlex-build
8383
8484
echo "Applying clang-tidy fixes using CMake target..."

.github/workflows/cmake-build.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,6 @@ jobs:
7474

7575
- name: Test
7676
run: |
77-
. $GITHUB_WORKSPACE/phlex-src/ci/entrypoint.sh
77+
. /entrypoint.sh
7878
cd $GITHUB_WORKSPACE/phlex-build
7979
ctest -j $(nproc)

.github/workflows/codeql-analysis.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ jobs:
5757

5858
- name: Test
5959
run: |
60-
. $GITHUB_WORKSPACE/phlex-src/ci/entrypoint.sh
60+
. /entrypoint.sh
6161
cd $GITHUB_WORKSPACE/phlex-build
6262
ctest -j $(nproc) || true
6363

.github/workflows/coverage.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ jobs:
156156

157157
- name: Run tests with coverage
158158
run: |
159-
. $GITHUB_WORKSPACE/phlex-src/ci/entrypoint.sh
159+
. /entrypoint.sh
160160
cd $GITHUB_WORKSPACE/phlex-build
161161
PROFILE_ROOT="$GITHUB_WORKSPACE/phlex-build/test/profraw"
162162
echo "Cleaning LLVM profile directory: $PROFILE_ROOT"
@@ -170,7 +170,7 @@ jobs:
170170
if: ${{ steps.coverage_options.outputs.compiler == 'gcc' }}
171171
shell: bash
172172
run: |
173-
. $GITHUB_WORKSPACE/phlex-src/ci/entrypoint.sh
173+
. /entrypoint.sh
174174
cd $GITHUB_WORKSPACE/phlex-build
175175
echo "Using GCC/gcovr/lcov bundled coverage target."
176176
cmake --build . --target coverage-gcov -v
@@ -198,7 +198,7 @@ jobs:
198198
if: ${{ steps.coverage_options.outputs.compiler == 'clang' }}
199199
shell: bash
200200
run: |
201-
. $GITHUB_WORKSPACE/phlex-src/ci/entrypoint.sh
201+
. /entrypoint.sh
202202
cd $GITHUB_WORKSPACE/phlex-build
203203
echo "Using Clang/llvm-cov coverage targets."
204204
cmake --build . --target coverage-llvm -v

0 commit comments

Comments
 (0)