master -> main

cppfw · Nov 17, 2024 · d3b5e7d · d3b5e7d
1 parent 9907310
commit d3b5e7d
Show file tree

Hide file tree

Showing 4 changed files with 53 additions and 50 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -31,7 +31,7 @@ jobs:
           - {os: debian, codename: bookworm, image_owner: arm32v7/, labels: [arm32,docker]}
           - {os: debian, codename: bookworm, image_owner: arm64v8/, labels: [arm64,docker]}
           # - {os: ubuntu, codename: focal, image_owner: }
-          - {os: ubuntu, codename: jammy, image_owner: }
+          # - {os: ubuntu, codename: jammy, image_owner: }
           - {os: ubuntu, codename: noble, image_owner: }
           # - {os: raspbian, codename: buster, image_owner: igagis/, labels: [arm32,docker]}
           # - {os: raspbian, codename: bullseye, image_owner: igagis/, labels: [arm32,docker]}
@@ -45,16 +45,16 @@ jobs:
           # configure timezone to avoid 'tzdata' package to require user interaction during installation (needed for ubuntu:focal)
           TZ=Europe/Helsinki ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
       - name: add cppfw deb repo
-        uses: myci-actions/add-deb-repo@master
+        uses: myci-actions/add-deb-repo@main
         with:
           repo: deb https://gagis.hopto.org/repo/cppfw/${{ matrix.os }} ${{ matrix.codename }} main
           repo-name: cppfw
           keys-asc: https://gagis.hopto.org/repo/cppfw/pubkey.gpg
           install: myci git devscripts equivs
       - name: git clone
-        uses: myci-actions/checkout@master
+        uses: myci-actions/checkout@main
       - name: set PACKAGE_VERSION
-        uses: myci-actions/export-env-var@master
+        uses: myci-actions/export-env-var@main
         with: {name: PACKAGE_VERSION, value: $(myci-deb-version.sh debian/changelog)}
       - name: prepare debian package
         run: myci-deb-prepare.sh --soname $(cat soname.txt)
@@ -84,17 +84,17 @@ jobs:
         run: |
           pacman --sync --refresh --sysupgrade --noconfirm --noprogressbar base-devel git
       - name: add cppfw pacman repo
-        uses: myci-actions/add-pacman-repo@master
+        uses: myci-actions/add-pacman-repo@main
         with:
           name: cppfw
           url: https://gagis.hopto.org/repo/cppfw/archlinux/${{ matrix.arch }}
           key-server: https://gagis.hopto.org/repo/cppfw/pubkey.gpg
           install: >-
             myci
       - name: git clone
-        uses: myci-actions/checkout@master
+        uses: myci-actions/checkout@main
       - name: set PACKAGE_VERSION
-        uses: myci-actions/export-env-var@master
+        uses: myci-actions/export-env-var@main
         with: {name: PACKAGE_VERSION, value: $(myci-deb-version.sh debian/changelog)}
       # makepkg needs to install dependency packages, so nobody user needs sudo rights
       - name: add nobody to sudoers
@@ -125,24 +125,24 @@ jobs:
         rm -rf /usr/local/bin/python3*
         rm -rf /usr/local/bin/python3*-config
     - name: git clone
-      uses: myci-actions/checkout@master
+      uses: myci-actions/checkout@main
     - name: add cppfw tap
       run: |
         brew tap cppfw/tap
         brew update
     - name: install ci tools
       run: brew install myci make
     - name: set PATH to use latest make
-      uses: myci-actions/export-env-var@master
+      uses: myci-actions/export-env-var@main
       with: {name: PATH, value: "$HOMEBREW_PREFIX/opt/make/libexec/gnubin:$PATH"}
     - name: set CFLAGS
-      uses: myci-actions/export-env-var@master
+      uses: myci-actions/export-env-var@main
       with: {name: CFLAGS, value: "-I $HOMEBREW_PREFIX/include $CFLAGS"}
     - name: set CXXFLAGS
-      uses: myci-actions/export-env-var@master
+      uses: myci-actions/export-env-var@main
       with: {name: CXXFLAGS, value: "-I $HOMEBREW_PREFIX/include $CXXFLAGS"}
     - name: set LDFLAGS
-      uses: myci-actions/export-env-var@master
+      uses: myci-actions/export-env-var@main
       with: {name: LDFLAGS, value: "-L $HOMEBREW_PREFIX/lib $LDFLAGS"}
     - name: install deps
       run: myci-brew-install.sh `myci-list-deps-homebrew.sh`
@@ -173,9 +173,9 @@ jobs:
     - name: install ci tools
       run: brew install myci
     - name: git clone
-      uses: myci-actions/checkout@master
+      uses: myci-actions/checkout@main
     - name: set PACKAGE_VERSION
-      uses: myci-actions/export-env-var@master
+      uses: myci-actions/export-env-var@main
       with: {name: PACKAGE_VERSION, value: $(myci-deb-version.sh debian/changelog)}
     - name: add cocoapods repo
       run: pod repo add --silent cppfw https://[email protected]/cppfw/cocoapods-repo.git
@@ -205,16 +205,16 @@ jobs:
     container: mingc/android-build-box:latest
     steps:
     - name: git clone
-      uses: myci-actions/checkout@master
+      uses: myci-actions/checkout@main
     - name: add cppfw deb repo
-      uses: myci-actions/add-deb-repo@master
+      uses: myci-actions/add-deb-repo@main
       with:
         repo: deb https://gagis.hopto.org/repo/cppfw/$(lsb_release --id --short | tr '[:upper:]' '[:lower:]') $(lsb_release --codename --short) main
         repo-name: cppfw
         keys-asc: https://gagis.hopto.org/repo/cppfw/pubkey.gpg
         install: myci
     - name: set PACKAGE_VERSION
-      uses: myci-actions/export-env-var@master
+      uses: myci-actions/export-env-var@main
       with: {name: PACKAGE_VERSION, value: $(myci-deb-version.sh debian/changelog)}
     - name: build
       run: |
@@ -248,22 +248,22 @@ jobs:
           msys2-devel
           mingw-w64-${{ matrix.arch }}-toolchain
     - name: add cppfw pacman msys repo
-      uses: myci-actions/add-pacman-repo@master
+      uses: myci-actions/add-pacman-repo@main
       with:
         name: cppfw_msys
         url: https://gagis.hopto.org/repo/cppfw/msys2/msys
         shell: 'msys2 {0}'
         key-server: https://gagis.hopto.org/repo/cppfw/pubkey.gpg
         install: myci
     - name: add cppfw pacman msys/mingw repo
-      uses: myci-actions/add-pacman-repo@master
+      uses: myci-actions/add-pacman-repo@main
       with:
         name: cppfw_${{ matrix.repo }}
         url: https://gagis.hopto.org/repo/cppfw/msys2/${{ matrix.repo }}
         shell: 'msys2 {0}'
         key-server: https://gagis.hopto.org/repo/cppfw/pubkey.gpg
     - name: git clone
-      uses: myci-actions/checkout@master
+      uses: myci-actions/checkout@main
     - name: prepare pacman package
       run: myci-apply-version.sh --version $(myci-deb-version.sh debian/changelog) msys2/PKGBUILD.in
     - name: build
@@ -289,7 +289,7 @@ jobs:
     - name: git clone
       uses: actions/checkout@v3
     - name: install CoAPP tools
-      uses: myci-actions/install-coapp-tools@master
+      uses: myci-actions/install-coapp-tools@main
     - name: nuget update
       run: |
         nuget restore msvs_solution/msvs_solution.sln
@@ -299,7 +299,7 @@ jobs:
     - name: build
       run: .\nuget\build_nuget.ps1
     - name: deploy
-      uses: myci-actions/publish-nuget@master
+      uses: myci-actions/publish-nuget@main
       with:
         filename: '.\nuget\*.nupkg'
         api-key: ${{ secrets.NUGET_DOT_ORG_API_KEY }}
@@ -310,39 +310,42 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - {os: ubuntu, codename: jammy, image_owner: , arch: x86_64}
-          # - {os: debian, codename: bullseye, image_owner: , arch: x86_64}
-          # - {os: debian, codename: bullseye, image_owner: i386/, arch: x86, labels: [i386,docker]}
-          - {os: debian, codename: bullseye, image_owner: arm32v7/, arch: armhf, labels: [arm32,docker]}
+          - {os: debian, codename: bookworm, image_owner: }
+          # - {os: debian, codename: bookworm, image_owner: i386/, labels: [i386,docker]}
+          - {os: debian, codename: bookworm, image_owner: , labels: [arm32,docker]}
+          - {os: debian, codename: bookworm, image_owner: , labels: [arm64,docker]}
     runs-on: ${{ (matrix.labels == '' && 'ubuntu-latest') || matrix.labels }}
     container: ${{ matrix.image_owner }}${{ matrix.os }}:${{ matrix.codename }}
-    name: conan - linux - ${{ matrix.arch }}
+    name: conan - linux | ${{ matrix.labels[0] }}
     steps:
       - name: clean
-        uses: myci-actions/clean@master
+        uses: myci-actions/clean@main
       - name: add cppfw deb repo
-        uses: myci-actions/add-deb-repo@master
+        uses: myci-actions/add-deb-repo@main
         with:
           repo: deb https://gagis.hopto.org/repo/cppfw/${{ matrix.os }} ${{ matrix.codename }} main
           repo-name: cppfw
           keys-asc: https://gagis.hopto.org/repo/cppfw/pubkey.gpg
-          install: devscripts equivs myci prorab prorab-extra python3-pip cmake git clang-tidy
+          install: devscripts equivs myci prorab prorab-extra pipx cmake git clang-tidy
+      - name: add ~/.local/bin to PATH
+        uses: myci-actions/export-env-var@main
+        with: {name: PATH, value: "$PATH:$HOME/.local/bin"}
       - name: install conan
-        run: pip3 --quiet install conan
+        run: pipx install conan
       - name: create default conan profile
         run: |
           conan profile detect --name default
           sed -i -E "s/compiler.cppstd=.*$/compiler.cppstd=17/g" ~/.conan2/profiles/default
       - name: git clone
-        uses: myci-actions/checkout@master
+        uses: myci-actions/checkout@main
       - name: set PACKAGE_VERSION
-        uses: myci-actions/export-env-var@master
+        uses: myci-actions/export-env-var@main
         with: {name: PACKAGE_VERSION, value: $(myci-deb-version.sh debian/changelog)}
         if: startsWith(github.ref, 'refs/tags/')
       - name: build
         run: |
           conan remote add cppfw $MYCI_CONAN_REMOTE
-          conan create conan --user $MYCI_CONAN_USER --channel main --version $PACKAGE_VERSION
+          conan create conan --build=missing --user $MYCI_CONAN_USER --channel main --version $PACKAGE_VERSION
       - name: deploy conan package
         run: |
           conan remote login --password $MYCI_CONAN_PASSWORD cppfw $MYCI_CONAN_USER
@@ -370,7 +373,7 @@ jobs:
           rm -rf /usr/local/bin/python3*
           rm -rf /usr/local/bin/python3*-config
       - name: git clone
-        uses: myci-actions/checkout@master
+        uses: myci-actions/checkout@main
       - name: add cppfw tap
         run: |
           brew tap cppfw/tap
@@ -382,12 +385,12 @@ jobs:
           conan profile detect --name default
           sed -i -E "s/compiler.cppstd=.*$/compiler.cppstd=17/g" ~/.conan2/profiles/default
       - name: set PATH
-        uses: myci-actions/export-env-var@master
+        uses: myci-actions/export-env-var@main
         with: {name: PATH, value: "/usr/local/opt/make/libexec/gnubin:$PATH"}
       - name: GNU make version
         run: make --version
       - name: set PACKAGE_VERSION
-        uses: myci-actions/export-env-var@master
+        uses: myci-actions/export-env-var@main
         with: {name: PACKAGE_VERSION, value: $(myci-deb-version.sh debian/changelog)}
         if: startsWith(github.ref, 'refs/tags/')
       - name: build

diff --git a/README.adoc b/README.adoc
@@ -17,7 +17,7 @@ The directory `src/agg` contains the forked project files.
 == Istallation
 :package_name: agg
 
-. Setup your OS-preferred package system repo following link:https://github.com/cppfw/wiki/blob/master/enable_repo/enable_repo.adoc[this manual]
+. Setup your OS-preferred package system repo following link:https://github.com/cppfw/wiki/blob/main/enable_repo/enable_repo.adoc[this manual]
 . Install package
 +
 - **conan** (multi-OS): **{package_name}**

diff --git a/nuget/build_nuget.ps1 b/nuget/build_nuget.ps1
@@ -38,14 +38,14 @@ Get-ChildItem "." -Filter *.in | Foreach-Object{
 # msbuild ../msvs_solution/msvs_solution.sln /t:Rebuild /p:Configuration=v141_Release /p:Platform=x64 /v:minimal /nologo
 # If(!$?){exit 1}
 
-msbuild ../msvs_solution/msvs_solution.sln /t:Rebuild /p:Configuration=v142_Debug_MD /p:Platform=x86 /v:minimal /nologo; If(!$?){exit 1}
-msbuild ../msvs_solution/msvs_solution.sln /t:Rebuild /p:Configuration=v142_Release_MD /p:Platform=x86 /v:minimal /nologo; If(!$?){exit 1}
-msbuild ../msvs_solution/msvs_solution.sln /t:Rebuild /p:Configuration=v142_Debug_MD /p:Platform=x64 /v:minimal /nologo; If(!$?){exit 1}
-msbuild ../msvs_solution/msvs_solution.sln /t:Rebuild /p:Configuration=v142_Release_MD /p:Platform=x64 /v:minimal /nologo; If(!$?){exit 1}
-msbuild ../msvs_solution/msvs_solution.sln /t:Rebuild /p:Configuration=v142_Debug_MT /p:Platform=x86 /v:minimal /nologo; If(!$?){exit 1}
-msbuild ../msvs_solution/msvs_solution.sln /t:Rebuild /p:Configuration=v142_Release_MT /p:Platform=x86 /v:minimal /nologo; If(!$?){exit 1}
-msbuild ../msvs_solution/msvs_solution.sln /t:Rebuild /p:Configuration=v142_Debug_MT /p:Platform=x64 /v:minimal /nologo; If(!$?){exit 1}
-msbuild ../msvs_solution/msvs_solution.sln /t:Rebuild /p:Configuration=v142_Release_MT /p:Platform=x64 /v:minimal /nologo; If(!$?){exit 1}
+# msbuild ../msvs_solution/msvs_solution.sln /t:Rebuild /p:Configuration=v142_Debug_MD /p:Platform=x86 /v:minimal /nologo; If(!$?){exit 1}
+# msbuild ../msvs_solution/msvs_solution.sln /t:Rebuild /p:Configuration=v142_Release_MD /p:Platform=x86 /v:minimal /nologo; If(!$?){exit 1}
+# msbuild ../msvs_solution/msvs_solution.sln /t:Rebuild /p:Configuration=v142_Debug_MD /p:Platform=x64 /v:minimal /nologo; If(!$?){exit 1}
+# msbuild ../msvs_solution/msvs_solution.sln /t:Rebuild /p:Configuration=v142_Release_MD /p:Platform=x64 /v:minimal /nologo; If(!$?){exit 1}
+# msbuild ../msvs_solution/msvs_solution.sln /t:Rebuild /p:Configuration=v142_Debug_MT /p:Platform=x86 /v:minimal /nologo; If(!$?){exit 1}
+# msbuild ../msvs_solution/msvs_solution.sln /t:Rebuild /p:Configuration=v142_Release_MT /p:Platform=x86 /v:minimal /nologo; If(!$?){exit 1}
+# msbuild ../msvs_solution/msvs_solution.sln /t:Rebuild /p:Configuration=v142_Debug_MT /p:Platform=x64 /v:minimal /nologo; If(!$?){exit 1}
+# msbuild ../msvs_solution/msvs_solution.sln /t:Rebuild /p:Configuration=v142_Release_MT /p:Platform=x64 /v:minimal /nologo; If(!$?){exit 1}
 
 msbuild ../msvs_solution/msvs_solution.sln /t:Rebuild /p:Configuration=v143_Debug_MD /p:Platform=x86 /v:minimal /nologo; If(!$?){exit 1}
 msbuild ../msvs_solution/msvs_solution.sln /t:Rebuild /p:Configuration=v143_Release_MD /p:Platform=x86 /v:minimal /nologo; If(!$?){exit 1}

diff --git a/nuget/nuget.autopkg.in b/nuget/nuget.autopkg.in
@@ -18,9 +18,9 @@ nuget{
 		title: Anti-grain geometry;
 		authors: {Maxim Shemanarev};
 		owners: {Ivan Gagis};
-		licenseUrl: "https://raw.githubusercontent.com/cppfw/agg/master/LICENSE";
+		licenseUrl: "https://raw.githubusercontent.com/cppfw/agg/main/LICENSE";
 		projectUrl: "https://github.com/cppfw/agg";
-		iconUrl: "https://github.com/cppfw/agg/blob/master/logo.svg";
+		iconUrl: "https://github.com/cppfw/agg/blob/main/logo.svg";
 		requireLicenseAcceptance:false;
 		summary: C++ SVG rendering library;
 
@@ -72,7 +72,7 @@ nuget{
 		}
 */
 		//==== v142 tools ====
-
+/*
 		[x86,v142,release,MultiThreaded] {
 			lib: ..\msvs_solution\v142_Release_MT\libagg.lib;
 		}
@@ -97,7 +97,7 @@ nuget{
 		[x64,v142,debug,MultiThreadedDebugDLL] {
 			lib: ..\msvs_solution\x64\v142_Debug_MD\libagg.lib;
 		}
-
+*/
 		//==== v143 tools ====
 
 		[x86,v143,release,MultiThreaded] {