Skip to content

Commit 4cd47f5

Browse files
igagisigagis
committed
master -> main
1 parent 0e1767d commit 4cd47f5

File tree

5 files changed

+67
-64
lines changed

5 files changed

+67
-64
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 53 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -23,20 +23,20 @@ jobs:
2323
linux_release: bookworm
2424
steps:
2525
- name: add cppfw deb repo
26-
uses: myci-actions/add-deb-repo@master
26+
uses: myci-actions/add-deb-repo@main
2727
with:
2828
repo: deb https://gagis.hopto.org/repo/cppfw/${{ env.linux_distro }} ${{ env.linux_release }} main
2929
repo-name: cppfw
3030
keys-asc: https://gagis.hopto.org/repo/cppfw/pubkey.gpg
3131
install: myci locales git pipx
3232
- name: add llvm repo (for clang-format)
33-
uses: myci-actions/add-deb-repo@master
33+
uses: myci-actions/add-deb-repo@main
3434
with:
3535
repo: deb http://apt.llvm.org/${{ env.linux_release }} llvm-toolchain-${{ env.linux_release }} main
3636
repo-name: llvm
3737
keys-asc: https://apt.llvm.org/llvm-snapshot.gpg.key
3838
- name: git clone
39-
uses: myci-actions/checkout@master
39+
uses: myci-actions/checkout@main
4040
- name: prepare debian package
4141
run: myci-deb-prepare.sh
4242
- name: install deps
@@ -73,21 +73,21 @@ jobs:
7373
fail-fast: false
7474
matrix:
7575
include:
76-
- {os: debian, codename: bullseye, image_owner: }
77-
- {os: debian, codename: bullseye, image_owner: , labels: [arm32,docker]}
76+
- {os: debian, codename: bookworm, image_owner: }
77+
- {os: debian, codename: bookworm, image_owner: , labels: [arm32,docker]}
7878
runs-on: ${{ (matrix.labels == '' && 'ubuntu-latest') || matrix.labels }}
7979
container: ${{ matrix.image_owner }}${{ matrix.os }}:${{ matrix.codename }}
8080
name: sanitizer - ${{ matrix.image_owner }}${{ matrix.os }}:${{ matrix.codename }} - ${{ matrix.labels[0] }}
8181
steps:
8282
- name: add cppfw deb repo
83-
uses: myci-actions/add-deb-repo@master
83+
uses: myci-actions/add-deb-repo@main
8484
with:
8585
repo: deb https://gagis.hopto.org/repo/cppfw/${{ matrix.os }} ${{ matrix.codename }} main
8686
repo-name: cppfw
8787
keys-asc: https://gagis.hopto.org/repo/cppfw/pubkey.gpg
8888
install: myci git python3-pip
8989
- name: add llvm repo (for clang-format)
90-
uses: myci-actions/add-deb-repo@master
90+
uses: myci-actions/add-deb-repo@main
9191
with:
9292
repo: deb http://apt.llvm.org/${{ matrix.codename }} llvm-toolchain-${{ matrix.codename }} main
9393
repo-name: llvm
@@ -96,7 +96,7 @@ jobs:
9696
run: |
9797
apt install --assume-yes devscripts equivs
9898
- name: git clone
99-
uses: myci-actions/checkout@master
99+
uses: myci-actions/checkout@main
100100
- name: prepare debian package
101101
run: myci-deb-prepare.sh
102102
- name: install deps
@@ -114,16 +114,16 @@ jobs:
114114
# - {os: debian, codename: buster, image_owner: }
115115
# - {os: debian, codename: buster, image_owner: i386/, labels: [i386,docker]}
116116
# - {os: debian, codename: buster, image_owner: arm32v7/, labels: [arm32,docker]}
117-
- {os: debian, codename: bullseye, image_owner: }
117+
# - {os: debian, codename: bullseye, image_owner: }
118118
# - {os: debian, codename: bullseye, image_owner: i386/, labels: [i386,docker]}
119-
- {os: debian, codename: bullseye, image_owner: , labels: [arm32,docker]}
120-
- {os: debian, codename: bullseye, image_owner: , labels: [arm64,docker]}
119+
# - {os: debian, codename: bullseye, image_owner: , labels: [arm32,docker]}
120+
# - {os: debian, codename: bullseye, image_owner: , labels: [arm64,docker]}
121121
- {os: debian, codename: bookworm, image_owner: }
122122
# - {os: debian, codename: bookworm, image_owner: i386/, labels: [i386,docker]}
123123
- {os: debian, codename: bookworm, image_owner: , labels: [arm32,docker]}
124124
- {os: debian, codename: bookworm, image_owner: , labels: [arm64,docker]}
125-
- {os: ubuntu, codename: focal, image_owner: }
126-
- {os: ubuntu, codename: jammy, image_owner: }
125+
# - {os: ubuntu, codename: focal, image_owner: }
126+
# - {os: ubuntu, codename: jammy, image_owner: }
127127
- {os: ubuntu, codename: noble, image_owner: }
128128
# - {os: raspbian, codename: buster, image_owner: igagis/, labels: [arm32,docker]}
129129
# - {os: raspbian, codename: bullseye, image_owner: igagis/, labels: [arm32,docker]}
@@ -137,22 +137,22 @@ jobs:
137137
# configure timezone to avoid 'tzdata' package to require user interaction during installation (needed for ubuntu:focal)
138138
TZ=Europe/Helsinki ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
139139
- name: add cppfw deb repo
140-
uses: myci-actions/add-deb-repo@master
140+
uses: myci-actions/add-deb-repo@main
141141
with:
142142
repo: deb https://gagis.hopto.org/repo/cppfw/${{ matrix.os }} ${{ matrix.codename }} main
143143
repo-name: cppfw
144144
keys-asc: https://gagis.hopto.org/repo/cppfw/pubkey.gpg
145145
install: myci git python3-pip devscripts equivs
146146
- name: add llvm repo (for clang-format)
147-
uses: myci-actions/add-deb-repo@master
147+
uses: myci-actions/add-deb-repo@main
148148
with:
149149
repo: deb http://apt.llvm.org/${{ matrix.codename }} llvm-toolchain-${{ matrix.codename }} main
150150
repo-name: llvm
151151
keys-asc: https://apt.llvm.org/llvm-snapshot.gpg.key
152152
- name: git clone
153-
uses: myci-actions/checkout@master
153+
uses: myci-actions/checkout@main
154154
- name: set PACKAGE_VERSION
155-
uses: myci-actions/export-env-var@master
155+
uses: myci-actions/export-env-var@main
156156
with: {name: PACKAGE_VERSION, value: $(myci-deb-version.sh debian/changelog)}
157157
- name: prepare debian package
158158
run: myci-deb-prepare.sh
@@ -188,17 +188,17 @@ jobs:
188188
# run: |
189189
# pacman --sync --refresh --sysupgrade --noconfirm --noprogressbar base-devel git
190190
# - name: add cppfw pacman repo
191-
# uses: myci-actions/add-pacman-repo@master
191+
# uses: myci-actions/add-pacman-repo@main
192192
# with:
193193
# name: cppfw
194194
# url: https://gagis.hopto.org/repo/cppfw/archlinux/${{ matrix.arch }}
195195
# key-server: https://gagis.hopto.org/repo/cppfw/pubkey.gpg
196196
# install: >-
197197
# myci
198198
# - name: git clone
199-
# uses: myci-actions/checkout@master
199+
# uses: myci-actions/checkout@main
200200
# - name: set PACKAGE_VERSION
201-
# uses: myci-actions/export-env-var@master
201+
# uses: myci-actions/export-env-var@main
202202
# with: {name: PACKAGE_VERSION, value: $(myci-deb-version.sh debian/changelog)}
203203
# # makepkg needs to install dependency packages, so nobody user needs sudo rights
204204
# - name: add nobody to sudoers
@@ -229,7 +229,7 @@ jobs:
229229
rm -rf /usr/local/bin/python3*
230230
rm -rf /usr/local/bin/python3*-config
231231
- name: git clone
232-
uses: myci-actions/checkout@master
232+
uses: myci-actions/checkout@main
233233
- name: install clang-tidy and clang-format
234234
run: |
235235
brew install llvm
@@ -243,16 +243,16 @@ jobs:
243243
- name: install ci tools
244244
run: brew install myci make
245245
- name: set PATH to use latest make
246-
uses: myci-actions/export-env-var@master
246+
uses: myci-actions/export-env-var@main
247247
with: {name: PATH, value: "$HOMEBREW_PREFIX/opt/make/libexec/gnubin:$PATH"}
248248
- name: set CFLAGS
249-
uses: myci-actions/export-env-var@master
249+
uses: myci-actions/export-env-var@main
250250
with: {name: CFLAGS, value: "-I $HOMEBREW_PREFIX/include $CFLAGS"}
251251
- name: set CXXFLAGS
252-
uses: myci-actions/export-env-var@master
252+
uses: myci-actions/export-env-var@main
253253
with: {name: CXXFLAGS, value: "-I $HOMEBREW_PREFIX/include $CXXFLAGS"}
254254
- name: set LDFLAGS
255-
uses: myci-actions/export-env-var@master
255+
uses: myci-actions/export-env-var@main
256256
with: {name: LDFLAGS, value: "-L $HOMEBREW_PREFIX/lib $LDFLAGS"}
257257
- name: install deps
258258
run: myci-brew-install.sh `myci-list-deps-homebrew.sh`
@@ -283,9 +283,9 @@ jobs:
283283
- name: install ci tools
284284
run: brew install myci
285285
- name: git clone
286-
uses: myci-actions/checkout@master
286+
uses: myci-actions/checkout@main
287287
- name: set PACKAGE_VERSION
288-
uses: myci-actions/export-env-var@master
288+
uses: myci-actions/export-env-var@main
289289
with: {name: PACKAGE_VERSION, value: $(myci-deb-version.sh debian/changelog)}
290290
- name: add cocoapods repo
291291
run: pod repo add --silent cppfw https://[email protected]/cppfw/cocoapods-repo.git
@@ -315,16 +315,16 @@ jobs:
315315
container: mingc/android-build-box:latest
316316
steps:
317317
- name: add cppfw deb repo
318-
uses: myci-actions/add-deb-repo@master
318+
uses: myci-actions/add-deb-repo@main
319319
with:
320320
repo: deb https://gagis.hopto.org/repo/cppfw/$(lsb_release --id --short | tr '[:upper:]' '[:lower:]') $(lsb_release --codename --short) main
321321
repo-name: cppfw
322322
keys-asc: https://gagis.hopto.org/repo/cppfw/pubkey.gpg
323323
install: myci git ninja-build
324324
- name: git clone
325-
uses: myci-actions/checkout@master
325+
uses: myci-actions/checkout@main
326326
- name: set PACKAGE_VERSION
327-
uses: myci-actions/export-env-var@master
327+
uses: myci-actions/export-env-var@main
328328
with: {name: PACKAGE_VERSION, value: $(myci-deb-version.sh debian/changelog)}
329329
- name: build
330330
run: |
@@ -358,22 +358,22 @@ jobs:
358358
msys2-devel
359359
mingw-w64-${{ matrix.arch }}-toolchain
360360
- name: add cppfw pacman msys repo
361-
uses: myci-actions/add-pacman-repo@master
361+
uses: myci-actions/add-pacman-repo@main
362362
with:
363363
name: cppfw_msys
364364
url: https://gagis.hopto.org/repo/cppfw/msys2/msys
365365
shell: 'msys2 {0}'
366366
key-server: https://gagis.hopto.org/repo/cppfw/pubkey.gpg
367367
install: myci
368368
- name: add cppfw pacman msys/mingw repo
369-
uses: myci-actions/add-pacman-repo@master
369+
uses: myci-actions/add-pacman-repo@main
370370
with:
371371
name: cppfw_${{ matrix.repo }}
372372
url: https://gagis.hopto.org/repo/cppfw/msys2/${{ matrix.repo }}
373373
shell: 'msys2 {0}'
374374
key-server: https://gagis.hopto.org/repo/cppfw/pubkey.gpg
375375
- name: git clone
376-
uses: myci-actions/checkout@master
376+
uses: myci-actions/checkout@main
377377
- name: prepare pacman package
378378
run: myci-apply-version.sh --version $(myci-deb-version.sh debian/changelog) msys2/PKGBUILD.in
379379
- name: build
@@ -399,7 +399,7 @@ jobs:
399399
- name: git clone
400400
uses: actions/checkout@v3
401401
- name: install CoAPP tools
402-
uses: myci-actions/install-coapp-tools@master
402+
uses: myci-actions/install-coapp-tools@main
403403
- name: nuget update
404404
run: |
405405
nuget restore msvs_solution/msvs_solution.sln
@@ -409,7 +409,7 @@ jobs:
409409
- name: build
410410
run: .\nuget\build_nuget.ps1
411411
- name: deploy
412-
uses: myci-actions/publish-nuget@master
412+
uses: myci-actions/publish-nuget@main
413413
with:
414414
filename: '.\nuget\*.nupkg'
415415
api-key: ${{ secrets.NUGET_DOT_ORG_API_KEY }}
@@ -420,44 +420,47 @@ jobs:
420420
fail-fast: false
421421
matrix:
422422
include:
423-
- {os: ubuntu, codename: jammy, image_owner: , arch: x86_64}
424-
# - {os: debian, codename: bullseye, image_owner: , arch: x86_64}
425-
# - {os: debian, codename: bullseye, image_owner: i386/, arch: x86, labels: [i386,docker]}
426-
# - {os: debian, codename: bullseye, image_owner: arm32v7/, arch: armhf, labels: [arm32,docker]}
423+
- {os: debian, codename: bookworm, image_owner: }
424+
# - {os: debian, codename: bookworm, image_owner: i386/, labels: [i386,docker]}
425+
- {os: debian, codename: bookworm, image_owner: , labels: [arm32,docker]}
426+
- {os: debian, codename: bookworm, image_owner: , labels: [arm64,docker]}
427427
runs-on: ${{ (matrix.labels == '' && 'ubuntu-latest') || matrix.labels }}
428428
container: ${{ matrix.image_owner }}${{ matrix.os }}:${{ matrix.codename }}
429-
name: conan - linux - ${{ matrix.arch }}
429+
name: conan - linux | ${{ matrix.labels[0] }}
430430
steps:
431431
- name: add llvm repo (for clang-format)
432-
uses: myci-actions/add-deb-repo@master
432+
uses: myci-actions/add-deb-repo@main
433433
with:
434434
repo: deb http://apt.llvm.org/${{ matrix.codename }} llvm-toolchain-${{ matrix.codename }} main
435435
repo-name: llvm
436436
keys-asc: https://apt.llvm.org/llvm-snapshot.gpg.key
437437
install: clang-format clang-tidy
438438
- name: add cppfw deb repo
439-
uses: myci-actions/add-deb-repo@master
439+
uses: myci-actions/add-deb-repo@main
440440
with:
441441
repo: deb https://gagis.hopto.org/repo/cppfw/${{ matrix.os }} ${{ matrix.codename }} main
442442
repo-name: cppfw
443443
keys-asc: https://gagis.hopto.org/repo/cppfw/pubkey.gpg
444-
install: devscripts equivs myci prorab prorab-extra python3-pip cmake git
444+
install: devscripts equivs myci prorab prorab-extra pipx cmake git
445+
- name: add ~/.local/bin to PATH
446+
uses: myci-actions/export-env-var@main
447+
with: {name: PATH, value: "$PATH:$HOME/.local/bin"}
445448
- name: install conan
446-
run: pip3 --quiet install conan
449+
run: pipx install conan
447450
- name: create default conan profile
448451
run: |
449452
conan profile detect --name default
450453
sed -i -E "s/compiler.cppstd=.*$/compiler.cppstd=17/g" ~/.conan2/profiles/default
451454
- name: git clone
452-
uses: myci-actions/checkout@master
455+
uses: myci-actions/checkout@main
453456
- name: set PACKAGE_VERSION
454-
uses: myci-actions/export-env-var@master
457+
uses: myci-actions/export-env-var@main
455458
with: {name: PACKAGE_VERSION, value: $(myci-deb-version.sh debian/changelog)}
456459
if: startsWith(github.ref, 'refs/tags/')
457460
- name: build
458461
run: |
459462
conan remote add cppfw $MYCI_CONAN_REMOTE
460-
conan create conan --user $MYCI_CONAN_USER --channel main --version $PACKAGE_VERSION
463+
conan create conan --build=missing --user $MYCI_CONAN_USER --channel main --version $PACKAGE_VERSION
461464
- name: deploy conan package
462465
run: |
463466
conan remote login --password $MYCI_CONAN_PASSWORD cppfw $MYCI_CONAN_USER
@@ -491,7 +494,7 @@ jobs:
491494
# ln -s "$(brew --prefix llvm)/bin/clang-tidy" "/usr/local/bin/clang-tidy"
492495
# ln -s "$(brew --prefix llvm)/bin/clang-apply-replacements" "/usr/local/bin/clang-apply-replacements"
493496
# - name: git clone
494-
# uses: myci-actions/checkout@master
497+
# uses: myci-actions/checkout@main
495498
# - name: add cppfw tap
496499
# run: |
497500
# brew tap cppfw/tap
@@ -503,10 +506,10 @@ jobs:
503506
# conan profile detect --name default
504507
# sed -i -E "s/compiler.cppstd=.*$/compiler.cppstd=17/g" ~/.conan2/profiles/default
505508
# - name: set PATH to use latest make
506-
# uses: myci-actions/export-env-var@master
509+
# uses: myci-actions/export-env-var@main
507510
# with: {name: PATH, value: "/usr/local/opt/make/libexec/gnubin:$PATH"}
508511
# - name: set PACKAGE_VERSION
509-
# uses: myci-actions/export-env-var@master
512+
# uses: myci-actions/export-env-var@main
510513
# with: {name: PACKAGE_VERSION, value: $(myci-deb-version.sh debian/changelog)}
511514
# if: startsWith(github.ref, 'refs/tags/')
512515
# - name: build

‎.gitmodules‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
[submodule "tool-configs"]
22
path = tool-configs
33
url = ../../cppfw/tool-configs
4-
branch = master
4+
branch = main

‎README.adoc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ CSS object model C++ library
1111
== Installation
1212
:package_name: {name}
1313

14-
. Setup your OS-preferred package system repo following link:https://github.com/cppfw/wiki/blob/master/enable_repo/enable_repo.adoc[this manual]
14+
. Setup your OS-preferred package system repo following link:https://github.com/cppfw/wiki/blob/main/enable_repo/enable_repo.adoc[this manual]
1515
. Install package
1616
+
1717
- **conan** (multi-OS): `{package_name}`

‎nuget/build_nuget.ps1‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,14 @@ Get-ChildItem "." -Filter *.in | Foreach-Object{
3838
# msbuild ../msvs_solution/msvs_solution.sln /t:Rebuild /p:Configuration=v141_Release /p:Platform=x64 /v:minimal /nologo
3939
# If(!$?){exit 1}
4040

41-
msbuild ../msvs_solution/msvs_solution.sln /t:Rebuild /p:Configuration=v142_Debug_MD /p:Platform=x86 /v:minimal /nologo; If(!$?){exit 1}
42-
msbuild ../msvs_solution/msvs_solution.sln /t:Rebuild /p:Configuration=v142_Release_MD /p:Platform=x86 /v:minimal /nologo; If(!$?){exit 1}
43-
msbuild ../msvs_solution/msvs_solution.sln /t:Rebuild /p:Configuration=v142_Debug_MD /p:Platform=x64 /v:minimal /nologo; If(!$?){exit 1}
44-
msbuild ../msvs_solution/msvs_solution.sln /t:Rebuild /p:Configuration=v142_Release_MD /p:Platform=x64 /v:minimal /nologo; If(!$?){exit 1}
45-
msbuild ../msvs_solution/msvs_solution.sln /t:Rebuild /p:Configuration=v142_Debug_MT /p:Platform=x86 /v:minimal /nologo; If(!$?){exit 1}
46-
msbuild ../msvs_solution/msvs_solution.sln /t:Rebuild /p:Configuration=v142_Release_MT /p:Platform=x86 /v:minimal /nologo; If(!$?){exit 1}
47-
msbuild ../msvs_solution/msvs_solution.sln /t:Rebuild /p:Configuration=v142_Debug_MT /p:Platform=x64 /v:minimal /nologo; If(!$?){exit 1}
48-
msbuild ../msvs_solution/msvs_solution.sln /t:Rebuild /p:Configuration=v142_Release_MT /p:Platform=x64 /v:minimal /nologo; If(!$?){exit 1}
41+
# msbuild ../msvs_solution/msvs_solution.sln /t:Rebuild /p:Configuration=v142_Debug_MD /p:Platform=x86 /v:minimal /nologo; If(!$?){exit 1}
42+
# msbuild ../msvs_solution/msvs_solution.sln /t:Rebuild /p:Configuration=v142_Release_MD /p:Platform=x86 /v:minimal /nologo; If(!$?){exit 1}
43+
# msbuild ../msvs_solution/msvs_solution.sln /t:Rebuild /p:Configuration=v142_Debug_MD /p:Platform=x64 /v:minimal /nologo; If(!$?){exit 1}
44+
# msbuild ../msvs_solution/msvs_solution.sln /t:Rebuild /p:Configuration=v142_Release_MD /p:Platform=x64 /v:minimal /nologo; If(!$?){exit 1}
45+
# msbuild ../msvs_solution/msvs_solution.sln /t:Rebuild /p:Configuration=v142_Debug_MT /p:Platform=x86 /v:minimal /nologo; If(!$?){exit 1}
46+
# msbuild ../msvs_solution/msvs_solution.sln /t:Rebuild /p:Configuration=v142_Release_MT /p:Platform=x86 /v:minimal /nologo; If(!$?){exit 1}
47+
# msbuild ../msvs_solution/msvs_solution.sln /t:Rebuild /p:Configuration=v142_Debug_MT /p:Platform=x64 /v:minimal /nologo; If(!$?){exit 1}
48+
# msbuild ../msvs_solution/msvs_solution.sln /t:Rebuild /p:Configuration=v142_Release_MT /p:Platform=x64 /v:minimal /nologo; If(!$?){exit 1}
4949

5050
msbuild ../msvs_solution/msvs_solution.sln /t:Rebuild /p:Configuration=v143_Debug_MD /p:Platform=x86 /v:minimal /nologo; If(!$?){exit 1}
5151
msbuild ../msvs_solution/msvs_solution.sln /t:Rebuild /p:Configuration=v143_Release_MD /p:Platform=x86 /v:minimal /nologo; If(!$?){exit 1}

‎nuget/nuget.autopkg.in‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ nuget{
1818
title: C++ CSS DOM library;
1919
authors: {Ivan Gagis};
2020
owners: {Ivan Gagis};
21-
licenseUrl: "https://raw.githubusercontent.com/cppfw/cssom/master/LICENSE";
21+
licenseUrl: "https://raw.githubusercontent.com/cppfw/cssom/main/LICENSE";
2222
projectUrl: "https://github.com/cppfw/cssom";
23-
iconUrl: "https://github.com/cppfw/cssom/blob/master/logo.svg";
23+
iconUrl: "https://github.com/cppfw/cssom/blob/main/logo.svg";
2424
requireLicenseAcceptance:false;
2525
summary: C++ CSS DOM library;
2626

@@ -73,7 +73,7 @@ nuget{
7373
}
7474
*/
7575
//==== v142 tools ====
76-
76+
/*
7777
[x86,v142,release,MultiThreaded] {
7878
lib: ..\msvs_solution\v142_Release_MT\libcssom.lib;
7979
}
@@ -98,7 +98,7 @@ nuget{
9898
[x64,v142,debug,MultiThreadedDebugDLL] {
9999
lib: ..\msvs_solution\x64\v142_Debug_MD\libcssom.lib;
100100
}
101-
101+
*/
102102
//==== v143 tools ====
103103

104104
[x86,v143,release,MultiThreaded] {

0 commit comments

Comments
 (0)