File tree Expand file tree Collapse file tree 3 files changed +10
-10
lines changed Expand file tree Collapse file tree 3 files changed +10
-10
lines changed Original file line number Diff line number Diff line change 1818 NO_FORCE : 1
1919 VS_VER : 17
2020 GA_CI_SECRET : ${{ secrets.CI_SECRET }}
21- USE_ARTIFACT : true
21+ USE_ARTIFACT : false
2222 DISABLE_WORKFLOW : " false"
2323
2424jobs :
Original file line number Diff line number Diff line change @@ -192,13 +192,13 @@ jobs:
192192 env :
193193 BUNDLE : ${{ matrix.bundle }}
194194 - name : Package
195- # if: github.repository == 'openframeworks/apothecary' && github.event_name == 'push' && (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/bleeding' || contains(github.ref, 'refs/tags/'))
195+ if : github.repository == 'openframeworks/apothecary' && github.event_name == 'push' && (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/bleeding' || contains(github.ref, 'refs/tags/'))
196196 working-directory : ${{ env.GITHUB_WORKSPACE }}
197197 run : scripts/package.sh
198198 env :
199199 BUNDLE : ${{ matrix.bundle }}
200200 - name : Upload binaries as Artifact
201- # if: github.repository == 'openframeworks/apothecary' && github.event_name == 'push' && (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/bleeding' )
201+ if : github.repository == 'openframeworks/apothecary' && github.event_name == 'push' && (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/bleeding' )
202202 uses : actions/upload-artifact@v4
203203 env :
204204 release : ${{ env.RELEASE }}
@@ -207,9 +207,6 @@ jobs:
207207 path : out/openFrameworksLibs_${{ env.RELEASE }}_${{ env.TARGET }}_${{ env.ARCH }}_${{ matrix.bundle }}.zip
208208 retention-days : 31
209209
210- # - name: Build Poco
211- # run: ./apothecary/apothecary -tvs -a${{ env.ARCH }} update poco
212-
213210 - name : Update Release x64
214211 if : github.repository == 'openframeworks/apothecary' && github.event_name == 'push' && (startsWith(github.ref, 'refs/tags/') || github.ref == 'refs/heads/master' || github.ref == 'refs/heads/bleeding')
215212
Original file line number Diff line number Diff line change @@ -11,7 +11,7 @@ FORMULA_DEPENDS=("zlib")
1111
1212# define the version
1313VER=5.4.3
14- BUILD_ID=2
14+ BUILD_ID=4
1515DEFINES=" "
1616
1717# tools for git use
@@ -147,13 +147,16 @@ function build() {
147147 DEFINES=" $DEFINES -DASSIMP_NO_EXPORT=ON"
148148 fi
149149
150+ if [ $MULTITHREADED_TYPE == " MD" ]; then
151+ sed -i ' s/\/MT/\/MD/g; s/\/MTd/\/MDd/g' CMakeLists.txt
152+ else
153+ sed -i ' s/\/MT/\/MD/g; s/\/MDd/\/MTd/g' CMakeLists.txt
154+ fi
155+
150156 if [ " ${ASSIMP_STATIC:- ${DEFAULT_VS_STATIC} } " = " 1" ]; then
151157 DEFINES=" ${DEFINES} \
152158 ${MT_TYPE_DEFINES} \
153159 -DBUILD_SHARED_LIBS=OFF"
154- if [ $MULTITHREADED_TYPE == " MD" ]; then
155- sed -i ' s/\/MT/\/MD/g; s/\/MTd/\/MDd/g' CMakeLists.txt
156- fi
157160 else
158161 DEFINES=" ${DEFINES} \
159162 ${MT_TYPE_DEFINES} \
You can’t perform that action at this time.
0 commit comments