Skip to content

Commit

Permalink
master -> main
Browse files Browse the repository at this point in the history
  • Loading branch information
igagis committed Nov 17, 2024
1 parent c90e86c commit 20dc95c
Show file tree
Hide file tree
Showing 6 changed files with 67 additions and 67 deletions.
88 changes: 44 additions & 44 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,14 @@ jobs:
name: sanitizer - ${{ matrix.image_owner }}${{ matrix.os }}:${{ matrix.codename }}
steps:
- 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
- name: add llvm repo (for clang-format)
uses: myci-actions/add-deb-repo@master
uses: myci-actions/add-deb-repo@main
with:
repo: deb http://apt.llvm.org/${{ matrix.codename }} llvm-toolchain-${{ matrix.codename }} main
repo-name: llvm
Expand All @@ -42,7 +42,7 @@ jobs:
run: |
apt install --assume-yes devscripts equivs
- name: git clone
uses: myci-actions/checkout@master
uses: myci-actions/checkout@main
- name: prepare debian package
run: myci-deb-prepare.sh
- name: install deps
Expand All @@ -69,7 +69,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]}
Expand All @@ -83,22 +83,22 @@ 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: add llvm repo (for clang-format)
uses: myci-actions/add-deb-repo@master
uses: myci-actions/add-deb-repo@main
with:
repo: deb http://apt.llvm.org/${{ matrix.codename }} llvm-toolchain-${{ matrix.codename }} main
repo-name: llvm
keys-asc: https://apt.llvm.org/llvm-snapshot.gpg.key
- 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
Expand Down Expand Up @@ -128,17 +128,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
Expand Down Expand Up @@ -169,7 +169,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: install clang-tidy and clang-format
run: |
brew install llvm
Expand All @@ -183,16 +183,16 @@ jobs:
- 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`
Expand Down Expand Up @@ -223,9 +223,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
Expand Down Expand Up @@ -255,16 +255,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 ninja-build
- 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: |
Expand Down Expand Up @@ -298,22 +298,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
Expand All @@ -339,7 +339,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
Expand All @@ -349,7 +349,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 }}
Expand All @@ -360,47 +360,47 @@ 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: add llvm repo (for clang-format)
uses: myci-actions/add-deb-repo@master
uses: myci-actions/add-deb-repo@main
with:
repo: deb http://apt.llvm.org/${{ matrix.codename }} llvm-toolchain-${{ matrix.codename }} main
repo-name: llvm
keys-asc: https://apt.llvm.org/llvm-snapshot.gpg.key
install: clang-format clang-tidy
- 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
- name: install ci tools
run: |
apt install --assume-yes devscripts equivs myci prorab prorab-extra python3-pip cmake
install: devscripts equivs myci prorab prorab-extra pipx cmake git
- 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
Expand Down Expand Up @@ -428,7 +428,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: install clang-tidy and clang-format
# run: |
# brew install llvm
Expand All @@ -446,10 +446,10 @@ jobs:
# conan profile detect --name default
# sed -i -E "s/compiler.cppstd=.*$/compiler.cppstd=17/g" ~/.conan2/profiles/default
# - 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: "/usr/local/opt/make/libexec/gnubin:$PATH"}
# - 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
Expand Down
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[submodule "tool-configs"]
path = tool-configs
url = ../../cppfw/tool-configs
branch = master
branch = main
32 changes: 16 additions & 16 deletions nuget/build_nuget.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -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 /m ../msvs_solution/msvs_solution.sln /t:Rebuild /p:Configuration=v143_Debug_MD /p:Platform=x86 /v:minimal /nologo; If(!$?){exit 1}
msbuild /m ../msvs_solution/msvs_solution.sln /t:Rebuild /p:Configuration=v143_Release_MD /p:Platform=x86 /v:minimal /nologo; If(!$?){exit 1}
Expand All @@ -61,14 +61,14 @@ msbuild /m ../msvs_solution/msvs_solution.sln /t:Rebuild /p:Configuration=v143_R
Push-Location
cd ../tests/unit

../../msvs_solution/v142_Debug_MD/tests.exe --jobs=2 --junit-out=junit_x86_v142_debug_md.xml; If(!$?){exit 1}
../../msvs_solution/v142_Debug_MT/tests.exe --jobs=2 --junit-out=junit_x86_v142_debug_mt.xml; If(!$?){exit 1}
../../msvs_solution/v142_Release_MD/tests.exe --jobs=2 --junit-out=junit_x86_v142_release_md.xml; If(!$?){exit 1}
../../msvs_solution/v142_Release_MT/tests.exe --jobs=2 --junit-out=junit_x86_v142_release_mt.xml; If(!$?){exit 1}
../../msvs_solution/x64/v142_Debug_MD/tests.exe --jobs=2 --junit-out=junit_x64_v142_debug_md.xml; If(!$?){exit 1}
../../msvs_solution/x64/v142_Debug_MT/tests.exe --jobs=2 --junit-out=junit_x64_v142_debug_mt.xml; If(!$?){exit 1}
../../msvs_solution/x64/v142_Release_MD/tests.exe --jobs=2 --junit-out=junit_x64_v142_release_md.xml; If(!$?){exit 1}
../../msvs_solution/x64/v142_Release_MT/tests.exe --jobs=2 --junit-out=junit_x64_v142_release_mt.xml; If(!$?){exit 1}
# ../../msvs_solution/v142_Debug_MD/tests.exe --jobs=2 --junit-out=junit_x86_v142_debug_md.xml; If(!$?){exit 1}
# ../../msvs_solution/v142_Debug_MT/tests.exe --jobs=2 --junit-out=junit_x86_v142_debug_mt.xml; If(!$?){exit 1}
# ../../msvs_solution/v142_Release_MD/tests.exe --jobs=2 --junit-out=junit_x86_v142_release_md.xml; If(!$?){exit 1}
# ../../msvs_solution/v142_Release_MT/tests.exe --jobs=2 --junit-out=junit_x86_v142_release_mt.xml; If(!$?){exit 1}
# ../../msvs_solution/x64/v142_Debug_MD/tests.exe --jobs=2 --junit-out=junit_x64_v142_debug_md.xml; If(!$?){exit 1}
# ../../msvs_solution/x64/v142_Debug_MT/tests.exe --jobs=2 --junit-out=junit_x64_v142_debug_mt.xml; If(!$?){exit 1}
# ../../msvs_solution/x64/v142_Release_MD/tests.exe --jobs=2 --junit-out=junit_x64_v142_release_md.xml; If(!$?){exit 1}
# ../../msvs_solution/x64/v142_Release_MT/tests.exe --jobs=2 --junit-out=junit_x64_v142_release_mt.xml; If(!$?){exit 1}

../../msvs_solution/v143_Debug_MD/tests.exe --jobs=2 --junit-out=junit_x86_v143_debug_md.xml; If(!$?){exit 1}
../../msvs_solution/v143_Debug_MT/tests.exe --jobs=2 --junit-out=junit_x86_v143_debug_mt.xml; If(!$?){exit 1}
Expand Down
8 changes: 4 additions & 4 deletions nuget/nuget.autopkg.in
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ nuget{
title: C++ XML parser library;
authors: {Ivan Gagis};
owners: {Ivan Gagis};
licenseUrl: "https://raw.githubusercontent.com/cppfw/mikroxml/master/LICENSE";
licenseUrl: "https://raw.githubusercontent.com/cppfw/mikroxml/main/LICENSE";
projectUrl: "https://github.com/cppfw/svgdom";
iconUrl: "https://github.com/cppfw/mikroxml/blob/master/logo.svg";
iconUrl: "https://github.com/cppfw/mikroxml/blob/main/logo.svg";
requireLicenseAcceptance:false;
summary: C++ XML parser library;

Expand Down Expand Up @@ -69,7 +69,7 @@ nuget{
}
*/
// ===== v142 =======

/*
[x86,v142,release,MultiThreaded] {
lib: ..\msvs_solution\v142_Release_MT\libmikroxml.lib;
}
Expand All @@ -94,7 +94,7 @@ nuget{
[x64,v142,debug,MultiThreadedDebugDLL] {
lib: ..\msvs_solution\x64\v142_Debug_MD\libmikroxml.lib;
}

*/
//==== v143 tools ====

[x86,v143,release,MultiThreaded] {
Expand Down
2 changes: 1 addition & 1 deletion wiki/Main.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
== Istallation
:package_name: mikroxml

. 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}`
Expand Down
2 changes: 1 addition & 1 deletion wiki/UsageTutorial.adoc
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
= Basic usage tutorial

Please refer to the test code: https://github.com/cppfw/mikroxml/blob/master/tests/samples/main.cpp
Please refer to the test code: https://github.com/cppfw/mikroxml/blob/main/tests/samples/main.cpp

0 comments on commit 20dc95c

Please sign in to comment.