|
73 | 73 |
|
74 | 74 | test-curve:
|
75 | 75 | name: Test Curve on ${{ matrix.backend }} with ${{ matrix.runner_os }}
|
76 |
| - # runs-on: [self-hosted, Linux, X64, icicle] |
77 | 76 | runs-on: ${{ matrix.runner }}
|
78 | 77 | needs: [check-changed-files, check-format, extract-cuda-backend-branch, extract-metal-backend-branch]
|
79 | 78 | strategy:
|
@@ -126,16 +125,16 @@ jobs:
|
126 | 125 | working-directory: ./icicle/backend/${{ matrix.backend }}
|
127 | 126 | id: extract-backend-sha
|
128 | 127 | run: |
|
129 |
| - ${{ matrix.backend_upper }}BACKEND_SHA=$(git rev-parse HEAD) |
130 |
| - echo "${{ matrix.backend_upper }} Backend Commit SHA: $${{ matrix.backend_upper }}_BACKEND_SHA" |
131 |
| - echo "${{ matrix.backend }}-backend-sha=$${{ matrix.backend_upper }}_BACKEND_SHA" >> $GITHUB_OUTPUT |
| 128 | + BACKEND_SHA=$(git rev-parse HEAD) |
| 129 | + echo "Backend Commit SHA: $BACKEND_SHA" |
| 130 | + echo "${{ matrix.backend }}-backend-sha=$BACKEND_SHA" >> $GITHUB_ENV |
132 | 131 | - name: Set ${{ matrix.backend_upper }} backend flag
|
133 | 132 | if: needs.check-changed-files.outputs.golang == 'true' || needs.check-changed-files.outputs.cpp == 'true' || needs.check-changed-files.outputs.rust == 'true'
|
134 | 133 | id: backend-flag
|
135 | 134 | run: |
|
136 |
| - ${{ matrix.backend_upper }}_BACKEND_SHA=${{ steps.extract-${{ matrix.backend }}-sha.outputs.${{ matrix.backend }}-backend-sha }} |
| 135 | + BACKEND_SHA=${{ env.${{ matrix.backend }}-backend-sha }} |
137 | 136 | CURVE=${{ matrix.curve.name }}
|
138 |
| - COMMIT_FILE="gh_commit_sha_${CURVE}_${${{ matrix.backend_upper }}_BACKEND_SHA}" |
| 137 | + COMMIT_FILE="gh_commit_sha_${CURVE}_${BACKEND_SHA}" |
139 | 138 | if [ "${{ needs.extract-${{ matrix.backend }}-backend-branch.outputs.${{ matrix.backend }}-backend-branch }}" == "main" ]; then
|
140 | 139 | INSTALL_PATH=${{ github.workspace }}/../../main_lib/curve/$CURVE
|
141 | 140 | echo "INSTALL_PATH=${{ github.workspace }}/../../main_lib/curve/$CURVE" >> $GITHUB_OUTPUT
|
@@ -174,23 +173,23 @@ jobs:
|
174 | 173 | if: needs.check-changed-files.outputs.golang == 'true' || needs.check-changed-files.outputs.cpp == 'true' || needs.check-changed-files.outputs.rust == 'true'
|
175 | 174 | run: |
|
176 | 175 | mkdir -p build && rm -rf build/*
|
177 |
| - cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTS=ON -DCURVE=${{ matrix.curve.name }} ${{ matrix.curve.build_args }} ${{ steps.${{ matrix.backend }}-flag.outputs.${{ matrix.backend_upper }}_FLAG }} ${{ steps.${{ matrix.backend }}-flag.outputs.CMAKE_INSTALL_PREFIX }} -S . -B build |
| 176 | + cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTS=ON -DCURVE=${{ matrix.curve.name }} ${{ matrix.curve.build_args }} ${{ steps.backend-flag.outputs.${{ matrix.backend_upper }}_FLAG }} ${{ steps.backend-flag.outputs.CMAKE_INSTALL_PREFIX }} -S . -B build |
178 | 177 | cmake --build build --target install -j
|
179 |
| - rm -rf ${{ steps.${{ matrix.backend }}-flag.outputs.INSTALL_PATH }}/lib/gh_commit_sha_${{ matrix.curve.name }}* |
180 |
| - touch ${{ steps.${{ matrix.backend }}-flag.outputs.COMMIT_FILE_PATH }} |
| 178 | + rm -rf ${{ steps.backend-flag.outputs.INSTALL_PATH }}/lib/gh_commit_sha_${{ matrix.curve.name }}* |
| 179 | + touch ${{ steps.backend-flag.outputs.COMMIT_FILE_PATH }} |
181 | 180 |
|
182 | 181 | - name: Run C++ Curve Tests
|
183 | 182 | working-directory: ./icicle/build/tests
|
184 | 183 | if: needs.check-changed-files.outputs.cpp == 'true'
|
185 | 184 | run: |
|
186 |
| - export ICICLE_BACKEND_INSTALL_DIR=${{ steps.${{ matrix.backend }}-flag.outputs.ICICLE_BACKEND_INSTALL_DIR }} |
| 185 | + export ICICLE_BACKEND_INSTALL_DIR=${{ steps.backend-flag.outputs.ICICLE_BACKEND_INSTALL_DIR }} |
187 | 186 | ctest --output-on-failure
|
188 | 187 | - name: Run C++ examples
|
189 | 188 | working-directory: ./examples/c++
|
190 | 189 | if: needs.check-changed-files.outputs.cpp == 'true' || needs.check-changed-files.outputs.examples == 'true'
|
191 | 190 | run: |
|
192 | 191 | CURVE=${{ matrix.curve.name }}
|
193 |
| - export ICICLE_BACKEND_INSTALL_DIR=${{ steps.${{ matrix.backend }}-flag.outputs.ICICLE_BACKEND_INSTALL_DIR }} |
| 192 | + export ICICLE_BACKEND_INSTALL_DIR=${{ steps.backend-flag.outputs.ICICLE_BACKEND_INSTALL_DIR }} |
194 | 193 | for dir in $(grep -l -r "\\-DCURVE=$CURVE" . | xargs -L1 dirname | sort -u); do
|
195 | 194 | if [ -d "$dir" ]; then
|
196 | 195 | echo "Running command in $dir"
|
@@ -223,7 +222,7 @@ jobs:
|
223 | 222 | CURVE=${{ matrix.curve.name }}
|
224 | 223 | CURVE_DIR=$(echo ${{ matrix.curve.name }} | sed -e 's/_//g')
|
225 | 224 | export ICICLE_BACKEND_INSTALL_DIR=${{ steps.cuda-flag.outputs.ICICLE_BACKEND_INSTALL_DIR }}
|
226 |
| - export LD_LIBRARY_PATH=${{ steps.${{ matrix.backend }}-flag.outputs.INSTALL_PATH }}/lib |
| 225 | + export LD_LIBRARY_PATH=${{ steps.backend-flag.outputs.INSTALL_PATH }}/lib |
227 | 226 | export CGO_LDFLAGS="-L$LD_LIBRARY_PATH -licicle_field_$CURVE -licicle_curve_$CURVE -lstdc++ -Wl,-rpath=LD_LIBRARY_PATH"
|
228 | 227 | go test ./$CURVE_DIR/tests -count=1 -failfast -p 2 -timeout 60m -v
|
229 | 228 |
|
|
0 commit comments