do not build for i386

GerHobbelt · Oct 30, 2021 · aaa0e8d · aaa0e8d
1 parent 6c7841b
commit aaa0e8d
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 15 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -23,9 +23,10 @@ jobs:
       matrix:
         include:
           - {os: debian, codename: buster, image_owner: , package_type: deb}
-          - {os: debian, codename: buster, image_owner: i386/, package_type: deb, labels: [i386,docker]}
+          # - {os: debian, codename: buster, image_owner: i386/, package_type: deb, labels: [i386,docker]}
           - {os: debian, codename: buster, image_owner: arm32v7/, package_type: deb, labels: [arm,docker]}
           - {os: debian, codename: bullseye, image_owner: , package_type: deb}
+          - {os: debian, codename: bullseye, image_owner: arm32v7/, package_type: deb, labels: [arm,docker]}
           - {os: ubuntu, codename: focal, image_owner: , package_type: deb}
           - {os: raspbian, codename: buster, image_owner: igagis/, package_type: deb, labels: [arm,docker]}
     runs-on: ${{ (matrix.labels == '' && 'ubuntu-latest') || matrix.labels }}
@@ -79,9 +80,9 @@ jobs:
     - name: install deps
       run: myci-brew-install.sh `myci-list-deps-homebrew.sh`
     - name: build
-      run: make autojobs=true
+      run: make
     - name: test
-      run: make test autojobs=true
+      run: make test
     - name: deploy
       run: myci-deploy-homebrew.sh --tap cppfw/tap
       if: startsWith(github.ref, 'refs/tags/')
@@ -140,8 +141,8 @@ jobs:
       run: |
         cd android
         ./gradlew copy_aar --warning-mode all
-        myci-apply-version.sh -v $PACKAGE_VERSION *.pom.in
-        myci-apply-version.sh -v $PACKAGE_VERSION *.aar.in --filename-only
+        myci-apply-version.sh --version $PACKAGE_VERSION *.pom.in
+        myci-apply-version.sh --version $PACKAGE_VERSION *.aar.in --filename-only
     - name: deploy
       run: myci-deploy-maven-nexus.sh --base-url http://gagis.hopto.org/nexus --repo android android/$PACKAGE_NAME-$PACKAGE_VERSION.aar
       if: startsWith(github.ref, 'refs/tags/')
@@ -185,13 +186,13 @@ jobs:
     - name: git clone
       uses: myci-actions/checkout@master
     - name: prepare pacman package
-      run: myci-apply-version.sh -v $(myci-deb-version.sh debian/changelog) msys2/PKGBUILD.in
+      run: myci-apply-version.sh --version $(myci-deb-version.sh debian/changelog) msys2/PKGBUILD.in
     - name: build
       # to make makepkg-mingw build only one architecture we need to set the MINGW_INSTALLS
       env: {MINGW_INSTALLS: '${{ matrix.repo }}'}
       run: |
         cd msys2
-        PKGEXT='.pkg.tar.xz' autojobs=true makepkg-mingw --syncdeps --noconfirm --skipinteg
+        PKGEXT='.pkg.tar.xz' makepkg-mingw --syncdeps --noconfirm --skipinteg
     - name: deploy
       run: |
         echo "${{ secrets.MYCI_REPO_SSH_KEY }}" > repo_key_rsa && chmod 600 repo_key_rsa
@@ -258,7 +259,7 @@ jobs:
         with: {name: PACKAGE_VERSION, value: $(myci-deb-version.sh debian/changelog)}
         if: startsWith(github.ref, 'refs/tags/')
       - name: prepare conanfile
-        run: myci-apply-version.sh -v $PACKAGE_VERSION conan/conanfile.py.in
+        run: myci-apply-version.sh --version $PACKAGE_VERSION conan/conanfile.py.in
       - name: build
         run: |
           conan remote add cppfw $MYCI_CONAN_REMOTE
@@ -291,7 +292,7 @@ jobs:
         with: {name: PACKAGE_VERSION, value: $(myci-deb-version.sh debian/changelog)}
         if: startsWith(github.ref, 'refs/tags/')
       - name: prepare conanfile
-        run: myci-apply-version.sh -v $PACKAGE_VERSION conan/conanfile.py.in
+        run: myci-apply-version.sh --version $PACKAGE_VERSION conan/conanfile.py.in
       - name: build
         run: |
           conan remote add cppfw $MYCI_CONAN_REMOTE

diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -6,7 +6,7 @@
 		{
 			"label": "build",
 			"type": "shell",
-			"command": "make autojobs=true",
+			"command": "make",
 			"problemMatcher": [
 				"$gcc"
 			]

diff --git a/cocoapods/agg.podspec.in b/cocoapods/agg.podspec.in
@@ -6,13 +6,13 @@ Pod::Spec.new do |s|
   s.license      = { :type => 'MIT', :file => 'LICENSE' }
   s.author       = { "Ivan Gagis" => "[email protected]" }
   s.platform     = :ios
-  s.ios.deployment_target = '8.0'
+  s.ios.deployment_target = '11.0'
 
   s.source = { :http => "http://gagis.hopto.org/repo/cppfw/cocoapods/#{s.name}-#{s.version}.zip" }
 
   s.source_files  = "include/**/*.{hpp,h}"
   s.header_mappings_dir = "include"
 
-  s.ios.vendored_library = "lib/ios/lib#{s.name}.a"
+  s.ios.vendored_framework = "lib/ios/#{s.name}.xcframework"
 
 end
diff --git a/conan/conanfile.py.in b/conan/conanfile.py.in
@@ -32,8 +32,8 @@ class AggConan(ConanFile):
 # conan_basic_setup()''')
 
 	def build(self):
-		self.run("CONANBUILDINFO_DIR=$(pwd)/ make autojobs=true")
-		self.run("CONANBUILDINFO_DIR=$(pwd)/ make autojobs=true test")
+		self.run("CONANBUILDINFO_DIR=$(pwd)/ make")
+		self.run("CONANBUILDINFO_DIR=$(pwd)/ make test")
 
 	def package(self):
 		self.copy("*.h", dst="include/agg", src="src/agg/include")

diff --git a/msys2/PKGBUILD.in b/msys2/PKGBUILD.in
@@ -54,7 +54,7 @@ prepare() {
 
 build() {
 	cd "$rootDir"
-	make autojobs=true
+	make
 }
 
 check() {