Skip to content

Commit 7de619b

Browse files
committed
ci: remove ios, msvs jobs, add vcpkg-ios job
1 parent bf5e76b commit 7de619b

File tree

20 files changed

+60
-2729
lines changed

20 files changed

+60
-2729
lines changed

.github/workflows/ci.yml

Lines changed: 57 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -302,53 +302,6 @@ jobs:
302302
- name: deploy
303303
run: myci-deploy-homebrew.sh --tap cppfw/tap
304304
if: startsWith(github.ref, 'refs/tags/')
305-
##### ios #####
306-
ios:
307-
runs-on: macos-latest
308-
steps:
309-
- name: workaround python2 and python3 issue when upgrading python
310-
run : |
311-
rm -rf /usr/local/bin/2to3*
312-
rm -rf /usr/local/bin/idle3*
313-
rm -rf /usr/local/bin/pydoc3*
314-
rm -rf /usr/local/bin/python3
315-
rm -rf /usr/local/bin/python3-config
316-
rm -rf /usr/local/bin/python3*
317-
rm -rf /usr/local/bin/python3*-config
318-
- name: add cppfw tap
319-
run: |
320-
brew tap cppfw/tap
321-
brew update
322-
- name: install ci tools
323-
run: brew install myci
324-
- name: git clone
325-
uses: myci-actions/checkout@main
326-
- name: set PACKAGE_VERSION
327-
uses: myci-actions/export-env-var@main
328-
with: {name: PACKAGE_VERSION, value: $(myci-deb-version.sh)}
329-
- name: add cocoapods repo
330-
run: pod repo add --silent cppfw https://$MYCI_GIT_USERNAME@github.com/cppfw/cocoapods-repo.git
331-
- name: install deps
332-
run: pod install --project-directory=xcode
333-
# - name: add sources to xcode project
334-
# run: |
335-
# curl -L https://github.com/zackslash/Xcode-Proj-Adder/raw/master/bin/XcodeProjAdder -O
336-
# chmod +x XcodeProjAdder
337-
# cd xcode/$PACKAGE_NAME
338-
# ../../XcodeProjAdder -XCP $PACKAGE_NAME.xcodeproj -SCSV `echo $(find ../../src -type f -name *.cpp) | sed -E -e 's/ /,/g'`
339-
- name: build
340-
run: |
341-
xcodebuild CONFIGURATION_BUILD_DIR=../build_ios -sdk iphoneos -workspace xcode/$PACKAGE_NAME.xcworkspace -scheme $PACKAGE_NAME -configuration Release
342-
xcodebuild CONFIGURATION_BUILD_DIR=../build_iossim -sdk iphonesimulator -workspace xcode/$PACKAGE_NAME.xcworkspace -scheme $PACKAGE_NAME -configuration Release
343-
xcodebuild -create-xcframework -framework "xcode/build_ios/$PACKAGE_NAME.framework" -framework "xcode/build_iossim/$PACKAGE_NAME.framework" -output "xcode/$PACKAGE_NAME.xcframework"
344-
- name: create package
345-
# run: myci-create-zip-package.sh --headers-dir src --file xcode/$PACKAGE_NAME.xcframework///lib/ios --file LICENSE $PACKAGE_NAME-$PACKAGE_VERSION.zip
346-
run: myci-create-zip-package.sh --headers-dir src --file LICENSE $PACKAGE_NAME-$PACKAGE_VERSION.zip
347-
- name: deploy
348-
run: |
349-
echo "${{ secrets.MYCI_REPO_SSH_KEY }}" > repo_key_rsa && chmod 600 repo_key_rsa
350-
myci-deploy-cocoapods-ssh.sh --repo cppfw --version $PACKAGE_VERSION --server gagis.hopto.org --key repo_key_rsa --generic-repo cppfw/cocoapods --package $PACKAGE_NAME-$PACKAGE_VERSION.zip build/cocoapods/$PACKAGE_NAME.podspec.in
351-
if: startsWith(github.ref, 'refs/tags/')
352305
##### android #####
353306
android:
354307
runs-on: ubuntu-latest
@@ -429,31 +382,6 @@ jobs:
429382
myci-deploy-pacman-ssh.sh --server gagis.hopto.org --key repo_key_rsa --repo cppfw/msys2/${{ matrix.repo }} --database cppfw_${{ matrix.repo }} $f
430383
done
431384
if: startsWith(github.ref, 'refs/tags/')
432-
##### msvs #####
433-
msvs:
434-
runs-on: windows-latest
435-
defaults:
436-
run:
437-
shell: powershell
438-
steps:
439-
- name: git clone
440-
uses: actions/checkout@v3
441-
- name: install CoAPP tools
442-
uses: myci-actions/install-coapp-tools@main
443-
- name: nuget update
444-
run: |
445-
nuget restore msvs_solution/msvs_solution.sln
446-
nuget update msvs_solution/msvs_solution.sln
447-
- name: add msbuild to PATH
448-
uses: microsoft/setup-msbuild@v1.1
449-
- name: build
450-
run: .\nuget\build_nuget.ps1
451-
- name: deploy
452-
uses: myci-actions/publish-nuget@main
453-
with:
454-
filename: '.\nuget\*.nupkg'
455-
api-key: ${{ secrets.NUGET_DOT_ORG_API_KEY }}
456-
if: startsWith(github.ref, 'refs/tags/')
457385
##### vcpkg-linux #####
458386
vcpkg-linux:
459387
strategy:
@@ -548,6 +476,63 @@ jobs:
548476
path: |
549477
vcpkg-installation/buildtrees/${{ env.PACKAGE_NAME }}/
550478
build/vcpkg/**/*.log
479+
##### vcpkg-ios #####
480+
vcpkg-ios:
481+
runs-on: macos-latest
482+
strategy:
483+
fail-fast: false
484+
matrix:
485+
config:
486+
- Debug
487+
- Release
488+
name: vcpkg - ios | ${{ matrix.config }}
489+
steps:
490+
- name: workaround python2 and python3 issue when upgrading python
491+
run : |
492+
rm -rf /usr/local/bin/2to3*
493+
rm -rf /usr/local/bin/idle3*
494+
rm -rf /usr/local/bin/pydoc3*
495+
rm -rf /usr/local/bin/python3
496+
rm -rf /usr/local/bin/python3-config
497+
rm -rf /usr/local/bin/python3*
498+
rm -rf /usr/local/bin/python3*-config
499+
- name: git clone
500+
uses: myci-actions/checkout@main
501+
with:
502+
submodules: true # non-recursive, no remote
503+
- name: install vcpkg
504+
run: |
505+
git clone https://github.com/microsoft/vcpkg.git vcpkg-installation
506+
(cd vcpkg-installation; ./bootstrap-vcpkg.sh)
507+
- name: set VCPKG_ROOT
508+
uses: myci-actions/export-env-var@main
509+
with: {name: VCPKG_ROOT, value: "$(pwd)/vcpkg-installation"}
510+
- name: add VCPKG_ROOT to PATH
511+
uses: myci-actions/export-env-var@main
512+
with: {name: PATH, value: "$PATH:$VCPKG_ROOT"}
513+
- name: add cppfw tap
514+
run: |
515+
brew tap cppfw/tap
516+
brew update
517+
- name: install ci tools
518+
run: brew install myci cmake
519+
- name: prepare vcpkg port
520+
run: |
521+
myci-vcpkg-prepare.sh --git-ref ${{ github.sha }}
522+
- name: test vcpkg port
523+
run: |
524+
cd build/vcpkg/test
525+
cmake -G Xcode -D CMAKE_SYSTEM_NAME=iOS -D VCPKG_TARGET_TRIPLET=arm64-ios-simulator .
526+
cmake --build . --parallel --config ${{ matrix.config }} -- -sdk iphonesimulator -arch arm64
527+
# ./test
528+
- name: upload vcpkg logs to artifacts
529+
if: always() # even if previous steps fail, this one needs to be run
530+
uses: actions/upload-artifact@v4
531+
with:
532+
name: vcpkg_ios_${{ matrix.config }}_logs
533+
path: |
534+
vcpkg-installation/buildtrees/${{ env.PACKAGE_NAME }}/
535+
build/vcpkg/**/*.log
551536
##### conan - linux #####
552537
conan-linux:
553538
strategy:

README.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@
66
| link:https://github.com/cppfw/{name}/releases[image:https://img.shields.io/github/tag/cppfw/{name}.svg[releases]] | link:https://github.com/cppfw/{name}/actions[image:https://github.com/cppfw/{name}/workflows/ci/badge.svg[ci status]] | link:https://codecov.io/gh/cppfw/r4[image:https://codecov.io/gh/cppfw/r4/branch/main/graph/badge.svg?token=LKA3SRSkc3[codecov.io]]
77
|====
88

9-
link:wiki/Main.adoc[WiKi]
9+
link:wiki/main.adoc[WiKi]

build/cocoapods/r4.podspec.in

Lines changed: 0 additions & 18 deletions
This file was deleted.

msvs_solution/msvs_solution.sln

Lines changed: 0 additions & 161 deletions
This file was deleted.

0 commit comments

Comments
 (0)