Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
104 changes: 51 additions & 53 deletions .github/workflows/build-macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,59 +30,58 @@ jobs:
OPT: ${{matrix.cfg.opt}}
steps:
- uses: actions/checkout@v4
- name: Cache compile
id: cache-compile
uses: actions/cache@v3
env:
cache-name: cache-keep-compile
with:
path: |
libs/openFrameworksCompiled/lib/osx/**/
addons/obj/osx/**/

# key: ${{ runner.os }}-${{matrix.cfg.opt}}-${{ env.cache-name }}-${{ hashFiles('**/*.cpp') }}
key: ${{ runner.os }}-${{matrix.cfg.opt}}-${{ env.cache-name }}-
restore-keys: |
${{ runner.os }}-${{matrix.cfg.opt}}-${{ env.cache-name }}-

# - name: Cache compile
# id: cache-compile
# uses: actions/cache@v3
# env:
# cache-name: cache-keep-compile
# with:
# path: |
# libs/openFrameworksCompiled/lib/osx/**/
# addons/obj/osx/**/
#
# # key: ${{ runner.os }}-${{matrix.cfg.opt}}-${{ env.cache-name }}-${{ hashFiles('**/*.cpp') }}
# key: ${{ runner.os }}-${{matrix.cfg.opt}}-${{ env.cache-name }}-
# restore-keys: |
# ${{ runner.os }}-${{matrix.cfg.opt}}-${{ env.cache-name }}-

- name: Cache libs
id: cache-libs
uses: actions/cache@v3
env:
cache-name: cache-install-libs
with:
path: |
libs/boost/**
libs/cairo/**
libs/curl/**
libs/fmod/**
libs/FreeImage/**
libs/freetype/**
libs/glew/**
libs/glfw/**
libs/glm/**
libs/json/**
libs/pugixml/**
libs/rtAudio/**
libs/tess2/**
libs/uriparser/**
libs/utf8/**
addons/ofxAssimpModelLoader/libs/**/
addons/ofxKinect/libs/**/
addons/ofxOpenCv/libs/**/
addons/ofxSvg/libs/**/
addons/ofxPoco/libs/**/

key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('scripts/apothecary/apothecary/formulas/**/*.sh') }}
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@dimitre I think for this to work correctly the apothecary submodule would need to be updated earlier in this script

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Glad you found the issue. maybe it was caching a previous version of apothecary libs.

restore-keys: |
${{ runner.os }}-build-${{ env.cache-name }}-
- if: ${{ steps.cache-libs.outputs.cache-hit != 'true' }}
# name: Download libs
# - name: Cache libs
# id: cache-libs
# uses: actions/cache@v3
# env:
# cache-name: cache-install-libs
# with:
# path: |
# libs/boost/**
# libs/cairo/**
# libs/curl/**
# libs/fmod/**
# libs/FreeImage/**
# libs/freetype/**
# libs/glew/**
# libs/glfw/**
# libs/glm/**
# libs/json/**
# libs/pugixml/**
# libs/rtAudio/**
# libs/tess2/**
# libs/uriparser/**
# libs/utf8/**
# addons/ofxAssimpModelLoader/libs/**/
# addons/ofxKinect/libs/**/
# addons/ofxOpenCv/libs/**/
# addons/ofxSvg/libs/**/
# addons/ofxPoco/libs/**/
#
# key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('scripts/apothecary/apothecary/formulas/**/*.sh') }}
# restore-keys: |
# ${{ runner.os }}-build-${{ env.cache-name }}-
# - if: ${{ steps.cache-libs.outputs.cache-hit != 'true' }}
- name: Download libs
# continue-on-error: true
run: ./scripts/$TARGET/download_libs.sh
- name: rm-dev
run: sudo rm -rf /Library/Developer
# - name: rm-dev
# run: sudo rm -rf /Library/Developer

# this step is not needed here because the script is empty
# - name: install
Expand All @@ -96,6 +95,5 @@ jobs:
scripts/ci/$TARGET/run_tests.sh;
fi
env:
DEVELOPER_DIR: "/Applications/Xcode_13.4.1.app/Contents/Developer"
SDKROOT: "/Applications/Xcode_13.4.1.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk"

DEVELOPER_DIR: "/Applications/Xcode.app/Contents/Developer"
SDKROOT: "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk"
2 changes: 1 addition & 1 deletion tests/addons/networkTcp/src/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,7 @@ class ofApp: public ofxUnitTestsApp{
void run(){
testNonBlocking();
testBlocking();
disconnectionAutoDetection();
//disconnectionAutoDetection();
testSendRaw();
testSendRawBytes();
testWrongConnect();
Expand Down