Skip to content

Commit 3696f50

Browse files
committed
Refactor env variables
1 parent 8eb3515 commit 3696f50

File tree

1 file changed

+24
-12
lines changed

1 file changed

+24
-12
lines changed

.github/workflows/ci.yml

Lines changed: 24 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,6 @@ jobs:
8888
CXX: ${{ matrix.cxx }}
8989
VERBOSE: 1
9090
THREADS: 2
91-
LIBZMQ: ${{ env.GITHUB_WORKSPACE }}/libzmq-build
92-
CPPZMQ: ${{ env.GITHUB_WORKSPACE }}/cppzmq-build
9391
BUILDTYPE: "Debug"
9492
COVERAGE: "OFF" # TODO
9593

@@ -109,42 +107,56 @@ jobs:
109107
- name: build_libzmq_cmake
110108
if: ${{ matrix.libzmqbuild == 'cmake' }}
111109
run: |
112-
cmake -Hlibzmq-${{ matrix.libzmq }} -B${LIBZMQ} ${{ matrix.platform}} \
110+
cmake -Hlibzmq-${{ matrix.libzmq }} -Blibzmq-build ${{ matrix.platform}} \
113111
-DWITH_PERF_TOOL=OFF \
114112
-DZMQ_BUILD_TESTS=OFF \
115113
-DCMAKE_BUILD_TYPE=Release \
116114
-DENABLE_DRAFTS=${{ matrix.drafts }}
117-
cmake --build ${LIBZMQ} -- ${{ matrix.makeargs }}
115+
cmake --build libzmq-build -- ${{ matrix.makeargs }}
116+
echo "LIBZMQ=${PWD}/libzmq-build" >> ${GITHUB_ENV}
118117
119118
- name: build_libzmq_pkgconfig
120119
if: ${{ matrix.libzmqbuild == 'pkgconfig' }}
121120
working-directory: libzmq-${{ matrix.libzmq }}
122121
run: |
123122
./autogen.sh &&
124-
./configure --prefix=${LIBZMQ} &&
123+
./configure --prefix=${PWD}/libzmq-build &&
125124
make ${{ matrix.makeargs }}
126125
make install
126+
echo "LIBZMQ=${PWD}/libzmq-build" >> ${GITHUB_ENV}
127127
128128
- name: build
129129
env:
130130
CMAKE_PREFIX_PATH: ${{ env.LIBZMQ }}
131131
run: |
132-
cmake -H. -B${CPPZMQ} ${{ matrix.platform}} \
132+
cmake -H. -Bbuild ${{ matrix.platform}} \
133133
-DCMAKE_BUILD_TYPE=${BUILDTYPE} \
134134
-DENABLE_DRAFTS=${{ matrix.drafts }} \
135135
-DCOVERAGE=${COVERAGE} \
136136
-DCMAKE_CXX_STANDARD=${{ matrix.cppstd }}
137-
cmake --build ${CPPZMQ} -- ${{ matrix.makeargs }}
137+
cmake --build build -- ${{ matrix.makeargs }}
138+
echo "CPPZMQ=${PWD}/build" >> ${GITHUB_ENV}
138139
139140
- name: test
140-
working-directory: ${{ env.CPPZMQ }}
141-
run: ctest -V -C ${BUILDTYPE}
141+
run: |
142+
cd ${{ env.CPPZMQ }}
143+
echo ${{ env.CPPZMQ }}
144+
ctest -V -C ${BUILDTYPE}
142145
143146
- name: demo
144147
env:
145148
CMAKE_PREFIX_PATH: ${{ env.LIBZMQ }}:${{ env.CPPZMQ }}
146149
run: |
147-
cmake -Hdemo -Bdemo/build
148-
cmake --build demo/build
149-
cd demo/build
150+
if [[ ${{ matrix.os }} == windows* ]]; then
151+
DELIM=";"
152+
else
153+
DELIM=":"
154+
fi
155+
export CMAKE_PREFIX_PATH=${{ env.LIBZMQ }}${DELIM}${{ env.CPPZMQ }}
156+
cd demo
157+
cmake -H. -Bbuild ${{ matrix.platform}} \
158+
-DCMAKE_BUILD_TYPE=${BUILDTYPE} \
159+
-DCMAKE_CXX_STANDARD=${{ matrix.cppstd }}
160+
cmake --build build -- ${{ matrix.makeargs }}
161+
cd build
150162
ctest -V -C ${BUILDTYPE}

0 commit comments

Comments
 (0)