Skip to content

Commit 31af103

Browse files
committed
tmp
1 parent a4334c3 commit 31af103

File tree

8 files changed

+549
-516
lines changed

8 files changed

+549
-516
lines changed

.github/workflows/cmake-build.yml

Lines changed: 2 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -45,15 +45,7 @@ jobs:
4545
with:
4646
submodules: 'recursive'
4747
fetch-depth: 0
48-
49-
# We need to specify Xcode15.3 here as the default for macos-14 runners is 15.01 which has a bug
50-
# causing linking to fail.
51-
- name: Setup Xcode 15.3
52-
if: matrix.os == 'macos-latest'
53-
uses: maxim-lobanov/setup-xcode@v1
54-
with:
55-
xcode-version: '15.3'
56-
48+
5749
# Further brew packages needed to run/install vcpkg dependencies
5850
- name: Setup MacOS dependencies
5951
if: matrix.os == 'macos-latest'
@@ -82,13 +74,4 @@ jobs:
8274
CC: ${{ matrix.compiler }}
8375
CXX: ${{ matrix.compilercxx }}
8476
run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}
85-
86-
87-
- name: Upload logs as artifacts
88-
if: always() # This ensures it runs even if the build fails
89-
uses: actions/upload-artifact@v3
90-
with:
91-
name: Build Logs
92-
path: |
93-
/Users/runner/work/PhotoshopAPI/PhotoshopAPI/thirdparty/vcpkg/buildtrees/detect_compiler/*.log
94-
/Users/runner/work/PhotoshopAPI/PhotoshopAPI/build/vcpkg-manifest-install.log
77+

.github/workflows/cmake-test.yml

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -53,15 +53,7 @@ jobs:
5353
with:
5454
submodules: 'recursive'
5555
fetch-depth: 0
56-
57-
# We need to specify Xcode15.3 here as the default for macos-14 runners is 15.01 which has a bug
58-
# causing linking to fail.
59-
- name: Setup Xcode 15.3
60-
if: matrix.os == 'macos-latest'
61-
uses: maxim-lobanov/setup-xcode@v1
62-
with:
63-
xcode-version: '15.3'
64-
56+
6557
# Further brew packages needed to run/install vcpkg dependencies
6658
- name: Setup MacOS dependencies
6759
if: matrix.os == 'macos-latest'
@@ -83,7 +75,7 @@ jobs:
8375
CFLAGS: ${{ matrix.cflags }}
8476
CXXFLAGS: ${{ matrix.cxxflags }}
8577
run: |
86-
cmake -B ${{github.workspace}}/build -DCMAKE_OSX_ARCHITECTURES="arm64" -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DPSAPI_BUILD_DOCS=OFF -DPSAPI_BUILD_BENCHMARKS=OFF -DPSAPI_BUILD_EXAMPLES=ON -DPSAPI_BUILD_PYTHON=OFF
78+
cmake -B ${{github.workspace}}/build -DCMAKE_OSX_ARCHITECTURES="arm64" -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DPSAPI_BUILD_DOCS=OFF -DPSAPI_BUILD_BENCHMARKS=OFF -DPSAPI_BUILD_EXAMPLES=OFF -DPSAPI_BUILD_PYTHON=OFF
8779
8880
- name: Build ${{ matrix.os }}-${{ matrix.compilercxx }}
8981
env:

0 commit comments

Comments
 (0)