@@ -26,68 +26,66 @@ jobs:
2626 RUN_ID=$(gh run list --workflow=opencv.yml --branch=${GITHUB_REF_NAME} --status=success --limit=1 --json databaseId | jq -r '.[0].databaseId')
2727 echo "Latest opencv run ID: $RUN_ID"
2828
29- echo "Downloading artifact 'opencv-linux-x64' from run ${RUN_ID}"
30- gh run download $RUN_ID --name opencv-linux-x64 --dir artifacts
31-
32- ls -lR artifacts
33-
29+ echo "Downloading artifact 'opencv' from run ${RUN_ID}"
30+ gh run download $RUN_ID --name opencv-linux-x64 --dir opencv
31+ ls -lR opencv
3432
35- # - name: Checkout OpenCvSharp
36- # uses: actions/checkout@v4
37- # with:
38- # repository: shimat/opencvsharp
39- # ref: ${{ env.OPENCVSHARP_VERSION }}
40- # path: opencvsharp
33+ - name : Checkout OpenCvSharp
34+ uses : actions/checkout@v4
35+ with :
36+ repository : shimat/opencvsharp
37+ ref : ${{ env.OPENCVSHARP_VERSION }}
38+ path : opencvsharp
4139
42- # - name: Apply Patches
43- # run: |
44- # cd opencvsharp
45- # git apply ../eng/opencvsharp.patch
40+ - name : Apply Patches
41+ run : |
42+ cd opencvsharp
43+ git apply ../eng/opencvsharp.patch
4644
47- # - name: Configure OpenCvSharp
48- # run: |
49- # cd opencvsharp && mkdir build && cd build && \
50- # cmake \
51- # -D CMAKE_INSTALL_PREFIX=${{ github.workspace }}/opencvsharp/build \
52- # -D OpenCV_DIR=${{ github.workspace }}/opencv/build \
53- # ../src
45+ - name : Configure OpenCvSharp
46+ run : |
47+ cd opencvsharp && mkdir build && cd build && \
48+ cmake \
49+ -D CMAKE_INSTALL_PREFIX=${{ github.workspace }}/opencvsharp/build \
50+ -D OpenCV_DIR=${{ github.workspace }}/opencv \
51+ ../src
5452
55- # - name: Build OpenCvSharp
56- # run: |
57- # cd opencvsharp/build && make -j$(nproc)
53+ - name : Build OpenCvSharp
54+ run : |
55+ cd opencvsharp/build && make -j$(nproc)
5856
59- # - name: Show OpenCvSharp Artifacts
60- # run: |
61- # cd opencvsharp/build
62- # ls -lR
63- # ldd OpenCvSharpExtern/libOpenCvSharpExtern.so
57+ - name : Show OpenCvSharp Artifacts
58+ run : |
59+ cd opencvsharp/build
60+ ls -lR
61+ ldd OpenCvSharpExtern/libOpenCvSharpExtern.so
6462
65- # - name: Test OpenCvSharp
66- # run: |
67- # mkdir test && cd test && echo '#include <stdio.h>
68- # int core_Mat_sizeof();
69- # int main()
70- # {
71- # int i = core_Mat_sizeof();
72- # printf("sizeof(Mat) = %d\n", i);
73- # return 0;
74- # }' > test.c
75- # gcc test.c -L../opencvsharp/build/OpenCvSharpExtern -lOpenCvSharpExtern -o test
63+ - name : Test OpenCvSharp
64+ run : |
65+ mkdir test && cd test && echo '#include <stdio.h>
66+ int core_Mat_sizeof();
67+ int main()
68+ {
69+ int i = core_Mat_sizeof();
70+ printf("sizeof(Mat) = %d\n", i);
71+ return 0;
72+ }' > test.c
73+ gcc test.c -L../opencvsharp/build/OpenCvSharpExtern -lOpenCvSharpExtern -o test
7674
77- # - name: Run Test
78- # run: |
79- # export LD_LIBRARY_PATH=${{ github.workspace }}/opencvsharp/build/OpenCvSharpExtern:$LD_LIBRARY_PATH
80- # cd test && ./test
75+ - name : Run Test
76+ run : |
77+ export LD_LIBRARY_PATH=${{ github.workspace }}/opencvsharp/build/OpenCvSharpExtern:$LD_LIBRARY_PATH
78+ cd test && ./test
8179
82- # - name: Make artifacts
83- # run: |
84- # mkdir artifacts && cd artifacts && mkdir lib test
85- # cp -r ../opencvsharp/build/OpenCvSharpExtern/libOpenCvSharpExtern.so ./lib
86- # cp -r ../test/* ./test
87- # ls -lR
80+ - name : Make artifacts
81+ run : |
82+ mkdir artifacts && cd artifacts && mkdir lib test
83+ cp -r ../opencvsharp/build/OpenCvSharpExtern/libOpenCvSharpExtern.so ./lib
84+ cp -r ../test/* ./test
85+ ls -lR
8886
89- # - name: Upload Artifacts
90- # uses: actions/upload-artifact@v4
91- # with:
92- # name: opencvsharp-${{ env.OPENCVSHARP_VERSION }}-ubuntu -linux-x64
93- # path: artifacts
87+ - name : Upload Artifacts
88+ uses : actions/upload-artifact@v4
89+ with :
90+ name : opencvsharp-linux-x64
91+ path : artifacts
0 commit comments