Skip to content

Commit 749095d

Browse files
igagisigagis
committed
master -> main
1 parent 998b7eb commit 749095d

6 files changed

Lines changed: 50 additions & 50 deletions

File tree

‎.github/workflows/ci.yml‎

Lines changed: 42 additions & 42 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 devscripts equivs 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 https://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
@@ -83,14 +83,14 @@ jobs:
8383
name: sanitizer - ${{ matrix.image_owner }}${{ matrix.os }}:${{ matrix.codename }} - ${{ matrix.labels[0] }}
8484
steps:
8585
- name: add cppfw deb repo
86-
uses: myci-actions/add-deb-repo@master
86+
uses: myci-actions/add-deb-repo@main
8787
with:
8888
repo: deb https://gagis.hopto.org/repo/cppfw/${{ matrix.os }} ${{ matrix.codename }} main
8989
repo-name: cppfw
9090
keys-asc: https://gagis.hopto.org/repo/cppfw/pubkey.gpg
9191
install: myci locales git
9292
- name: add llvm repo (for clang-format)
93-
uses: myci-actions/add-deb-repo@master
93+
uses: myci-actions/add-deb-repo@main
9494
with:
9595
repo: deb https://apt.llvm.org/${{ matrix.codename }} llvm-toolchain-${{ matrix.codename }} main
9696
repo-name: llvm
@@ -99,7 +99,7 @@ jobs:
9999
run: |
100100
apt --quiet install --assume-yes devscripts equivs
101101
- name: git clone
102-
uses: myci-actions/checkout@master
102+
uses: myci-actions/checkout@main
103103
- name: prepare debian package
104104
run: myci-deb-prepare.sh
105105
- name: install deps
@@ -131,22 +131,22 @@ jobs:
131131
# configure timezone to avoid 'tzdata' package to require user interaction during installation (needed for ubuntu:focal)
132132
TZ=Europe/Helsinki ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
133133
- name: add cppfw deb repo
134-
uses: myci-actions/add-deb-repo@master
134+
uses: myci-actions/add-deb-repo@main
135135
with:
136136
repo: deb https://gagis.hopto.org/repo/cppfw/${{ matrix.os }} ${{ matrix.codename }} main
137137
repo-name: cppfw
138138
keys-asc: https://gagis.hopto.org/repo/cppfw/pubkey.gpg
139139
install: myci locales git devscripts equivs nodejs
140140
- name: add llvm repo (for clang-format)
141-
uses: myci-actions/add-deb-repo@master
141+
uses: myci-actions/add-deb-repo@main
142142
with:
143143
repo: deb https://apt.llvm.org/${{ matrix.codename }} llvm-toolchain-${{ matrix.codename }} main
144144
repo-name: llvm
145145
keys-asc: https://apt.llvm.org/llvm-snapshot.gpg.key
146146
- name: git clone
147-
uses: myci-actions/checkout@master
147+
uses: myci-actions/checkout@main
148148
- name: set PACKAGE_VERSION
149-
uses: myci-actions/export-env-var@master
149+
uses: myci-actions/export-env-var@main
150150
with: {name: PACKAGE_VERSION, value: $(myci-deb-version.sh debian/changelog)}
151151
- name: prepare debian package
152152
run: myci-deb-prepare.sh
@@ -196,22 +196,22 @@ jobs:
196196
# configure timezone to avoid 'tzdata' package to require user interaction during installation (needed for ubuntu:focal)
197197
TZ=Europe/Helsinki ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
198198
- name: add cppfw deb repo
199-
uses: myci-actions/add-deb-repo@master
199+
uses: myci-actions/add-deb-repo@main
200200
with:
201201
repo: deb https://gagis.hopto.org/repo/cppfw/${{ matrix.os }} ${{ matrix.codename }} main
202202
repo-name: cppfw
203203
keys-asc: https://gagis.hopto.org/repo/cppfw/pubkey.gpg
204204
install: myci locales git devscripts equivs nodejs
205205
- name: add llvm repo (for clang-format)
206-
uses: myci-actions/add-deb-repo@master
206+
uses: myci-actions/add-deb-repo@main
207207
with:
208208
repo: deb https://apt.llvm.org/${{ matrix.codename }} llvm-toolchain-${{ matrix.codename }} main
209209
repo-name: llvm
210210
keys-asc: https://apt.llvm.org/llvm-snapshot.gpg.key
211211
- name: git clone
212-
uses: myci-actions/checkout@master
212+
uses: myci-actions/checkout@main
213213
- name: set PACKAGE_VERSION
214-
uses: myci-actions/export-env-var@master
214+
uses: myci-actions/export-env-var@main
215215
with: {name: PACKAGE_VERSION, value: $(myci-deb-version.sh debian/changelog)}
216216
- name: prepare debian package
217217
run: myci-deb-prepare.sh
@@ -255,17 +255,17 @@ jobs:
255255
# run: |
256256
# pacman --sync --refresh --sysupgrade --noconfirm --noprogressbar base-devel git
257257
# - name: add cppfw pacman repo
258-
# uses: myci-actions/add-pacman-repo@master
258+
# uses: myci-actions/add-pacman-repo@main
259259
# with:
260260
# name: cppfw
261261
# url: https://gagis.hopto.org/repo/cppfw/archlinux/${{ matrix.arch }}
262262
# key-server: https://gagis.hopto.org/repo/cppfw/pubkey.gpg
263263
# install: >-
264264
# myci
265265
# - name: git clone
266-
# uses: myci-actions/checkout@master
266+
# uses: myci-actions/checkout@main
267267
# - name: set PACKAGE_VERSION
268-
# uses: myci-actions/export-env-var@master
268+
# uses: myci-actions/export-env-var@main
269269
# with: {name: PACKAGE_VERSION, value: $(myci-deb-version.sh debian/changelog)}
270270
# # makepkg needs to install dependency packages, so nobody user needs sudo rights
271271
# - name: add nobody to sudoers
@@ -296,7 +296,7 @@ jobs:
296296
rm -rf /usr/local/bin/python3*
297297
rm -rf /usr/local/bin/python3*-config
298298
- name: git clone
299-
uses: myci-actions/checkout@master
299+
uses: myci-actions/checkout@main
300300
- name: install clang-tidy and clang-format
301301
run: |
302302
brew install llvm
@@ -310,16 +310,16 @@ jobs:
310310
- name: install ci tools
311311
run: brew install myci make
312312
- name: set PATH to use latest make
313-
uses: myci-actions/export-env-var@master
313+
uses: myci-actions/export-env-var@main
314314
with: {name: PATH, value: "$HOMEBREW_PREFIX/opt/make/libexec/gnubin:$PATH"}
315315
- name: set CFLAGS
316-
uses: myci-actions/export-env-var@master
316+
uses: myci-actions/export-env-var@main
317317
with: {name: CFLAGS, value: "-I $HOMEBREW_PREFIX/include $CFLAGS"}
318318
- name: set CXXFLAGS
319-
uses: myci-actions/export-env-var@master
319+
uses: myci-actions/export-env-var@main
320320
with: {name: CXXFLAGS, value: "-I $HOMEBREW_PREFIX/include $CXXFLAGS"}
321321
- name: set LDFLAGS
322-
uses: myci-actions/export-env-var@master
322+
uses: myci-actions/export-env-var@main
323323
with: {name: LDFLAGS, value: "-L $HOMEBREW_PREFIX/lib $LDFLAGS"}
324324
- name: install deps
325325
run: myci-brew-install.sh `myci-list-deps-homebrew.sh`
@@ -350,9 +350,9 @@ jobs:
350350
- name: install ci tools
351351
run: brew install myci
352352
- name: git clone
353-
uses: myci-actions/checkout@master
353+
uses: myci-actions/checkout@main
354354
- name: set PACKAGE_VERSION
355-
uses: myci-actions/export-env-var@master
355+
uses: myci-actions/export-env-var@main
356356
with: {name: PACKAGE_VERSION, value: $(myci-deb-version.sh debian/changelog)}
357357
- name: add cocoapods repo
358358
run: pod repo add --silent cppfw https://$MYCI_GIT_USERNAME@github.com/cppfw/cocoapods-repo.git
@@ -387,16 +387,16 @@ jobs:
387387
container: mingc/android-build-box:latest
388388
steps:
389389
- name: git clone
390-
uses: myci-actions/checkout@master
390+
uses: myci-actions/checkout@main
391391
- name: add cppfw deb repo
392-
uses: myci-actions/add-deb-repo@master
392+
uses: myci-actions/add-deb-repo@main
393393
with:
394394
repo: deb https://gagis.hopto.org/repo/cppfw/$(lsb_release --id --short | tr '[:upper:]' '[:lower:]') $(lsb_release --codename --short) main
395395
repo-name: cppfw
396396
keys-asc: https://gagis.hopto.org/repo/cppfw/pubkey.gpg
397397
install: myci
398398
- name: set PACKAGE_VERSION
399-
uses: myci-actions/export-env-var@master
399+
uses: myci-actions/export-env-var@main
400400
with: {name: PACKAGE_VERSION, value: $(myci-deb-version.sh debian/changelog)}
401401
- name: build
402402
run: |
@@ -430,22 +430,22 @@ jobs:
430430
msys2-devel
431431
mingw-w64-${{ matrix.arch }}-toolchain
432432
- name: add cppfw pacman msys repo
433-
uses: myci-actions/add-pacman-repo@master
433+
uses: myci-actions/add-pacman-repo@main
434434
with:
435435
name: cppfw_msys
436436
url: https://gagis.hopto.org/repo/cppfw/msys2/msys
437437
shell: 'msys2 {0}'
438438
key-server: https://gagis.hopto.org/repo/cppfw/pubkey.gpg
439439
install: myci
440440
# - name: add cppfw pacman msys/mingw repo
441-
# uses: myci-actions/add-pacman-repo@master
441+
# uses: myci-actions/add-pacman-repo@main
442442
# with:
443443
# name: cppfw_${{ matrix.repo }}
444444
# url: https://gagis.hopto.org/repo/cppfw/msys2/${{ matrix.repo }}
445445
# shell: 'msys2 {0}'
446446
# key-server: https://gagis.hopto.org/repo/cppfw/pubkey.gpg
447447
- name: git clone
448-
uses: myci-actions/checkout@master
448+
uses: myci-actions/checkout@main
449449
- name: prepare pacman package
450450
run: myci-apply-version.sh --version $(myci-deb-version.sh debian/changelog) msys2/PKGBUILD.in
451451
- name: build
@@ -472,7 +472,7 @@ jobs:
472472
uses: actions/checkout@v3
473473
with: {submodules: true}
474474
- name: install CoAPP tools
475-
uses: myci-actions/install-coapp-tools@master
475+
uses: myci-actions/install-coapp-tools@main
476476
- name: nuget update
477477
run: |
478478
nuget restore msvs_solution/msvs_solution.sln
@@ -482,7 +482,7 @@ jobs:
482482
- name: build
483483
run: .\nuget\build_nuget.ps1
484484
- name: deploy
485-
uses: myci-actions/publish-nuget@master
485+
uses: myci-actions/publish-nuget@main
486486
with:
487487
filename: '.\nuget\*.nupkg'
488488
api-key: ${{ secrets.NUGET_DOT_ORG_API_KEY }}
@@ -494,7 +494,7 @@ jobs:
494494
matrix:
495495
include:
496496
# - {os: ubuntu, codename: jammy, image_owner: }
497-
# - {os: ubuntu, codename: noble, image_owner: }
497+
- {os: ubuntu, codename: noble, image_owner: }
498498
- {os: debian, codename: bookworm, image_owner: }
499499
# - {os: debian, codename: bookworm, image_owner: i386/, labels: [i386,docker]}
500500
- {os: debian, codename: bookworm, image_owner: , labels: [arm32,docker]}
@@ -504,21 +504,21 @@ jobs:
504504
name: conan - linux | ${{ matrix.labels[0] }}
505505
steps:
506506
- name: add llvm repo (for clang-format)
507-
uses: myci-actions/add-deb-repo@master
507+
uses: myci-actions/add-deb-repo@main
508508
with:
509509
repo: deb https://apt.llvm.org/${{ matrix.codename }} llvm-toolchain-${{ matrix.codename }} main
510510
repo-name: llvm
511511
keys-asc: https://apt.llvm.org/llvm-snapshot.gpg.key
512512
install: clang-format clang-tidy
513513
- name: add cppfw deb repo
514-
uses: myci-actions/add-deb-repo@master
514+
uses: myci-actions/add-deb-repo@main
515515
with:
516516
repo: deb https://gagis.hopto.org/repo/cppfw/${{ matrix.os }} ${{ matrix.codename }} main
517517
repo-name: cppfw
518518
keys-asc: https://gagis.hopto.org/repo/cppfw/pubkey.gpg
519519
install: devscripts equivs myci prorab prorab-extra pipx cmake git
520520
- name: add ~/.local/bin to PATH
521-
uses: myci-actions/export-env-var@master
521+
uses: myci-actions/export-env-var@main
522522
with: {name: PATH, value: "$PATH:$HOME/.local/bin"}
523523
- name: install conan
524524
run: pipx install conan
@@ -527,17 +527,17 @@ jobs:
527527
conan profile detect --name default
528528
sed -i -E "s/compiler.cppstd=.*$/compiler.cppstd=17/g" ~/.conan2/profiles/default
529529
- name: git clone
530-
uses: myci-actions/checkout@master
530+
uses: myci-actions/checkout@main
531531
with:
532532
submodules: false
533533
- name: set PACKAGE_VERSION
534-
uses: myci-actions/export-env-var@master
534+
uses: myci-actions/export-env-var@main
535535
with: {name: PACKAGE_VERSION, value: $(myci-deb-version.sh debian/changelog)}
536536
if: startsWith(github.ref, 'refs/tags/')
537537
- name: build
538538
run: |
539539
conan remote add cppfw $MYCI_CONAN_REMOTE
540-
conan create conan --user $MYCI_CONAN_USER --channel main --version $PACKAGE_VERSION
540+
conan create conan --build=missing --user $MYCI_CONAN_USER --channel main --version $PACKAGE_VERSION
541541
- name: deploy conan package
542542
run: |
543543
conan remote login --password $MYCI_CONAN_PASSWORD cppfw $MYCI_CONAN_USER
@@ -567,7 +567,7 @@ jobs:
567567
# rm -rf /usr/local/bin/python3*
568568
# rm -rf /usr/local/bin/python3*-config
569569
# - name: git clone
570-
# uses: myci-actions/checkout@master
570+
# uses: myci-actions/checkout@main
571571
# with:
572572
# submodules: false
573573
# - name: install clang-tidy and clang-format
@@ -588,10 +588,10 @@ jobs:
588588
# conan profile detect --name default
589589
# sed -i -E "s/compiler.cppstd=.*$/compiler.cppstd=17/g" ~/.conan2/profiles/default
590590
# - name: set PATH to use latest make
591-
# uses: myci-actions/export-env-var@master
591+
# uses: myci-actions/export-env-var@main
592592
# with: {name: PATH, value: "$HOMEBREW_PREFIX/opt/make/libexec/gnubin:$PATH"}
593593
# - name: set PACKAGE_VERSION
594-
# uses: myci-actions/export-env-var@master
594+
# uses: myci-actions/export-env-var@main
595595
# with: {name: PACKAGE_VERSION, value: $(myci-deb-version.sh debian/changelog)}
596596
# if: startsWith(github.ref, 'refs/tags/')
597597
# - name: build

‎.gitmodules‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
[submodule "tests/harness/clargs"]
22
path = tests/harness/clargs
33
url = ../../cppfw/clargs
4-
branch = master
4+
branch = main
55
# ignore = dirty
66
[submodule "tests/harness/tst"]
77
path = tests/harness/tst
88
url = ../../cppfw/tst
9-
branch = master
9+
branch = main
1010
# ignore = dirty
1111
[submodule "tool-configs"]
1212
path = tool-configs
1313
url = ../../cppfw/tool-configs
14-
branch = master
14+
branch = main

‎README.adoc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
= {name}
44

55
|====
6-
| 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/{name}[image:https://codecov.io/gh/cppfw/{name}/branch/master/graph/badge.svg?token=LKA3SRSkc3[codecov.io]]
6+
| 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/{name}[image:https://codecov.io/gh/cppfw/{name}/branch/main/graph/badge.svg?token=LKA3SRSkc3[codecov.io]]
77
|====
88

99
C++ utility library. Stuff missing from `std::` namespace.

‎nuget/nuget.autopkg.in‎

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

‎vcpkg/utki/portfile.cmake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ vcpkg_from_github(
55
REPO cppfw/${PORT}
66
#REF "${VERSION}"
77
#SHA512 b315be256b0fbd7a9be2e8db894381d1270ecc8701a53ca04d5741d1a4d5e01e3a7f30f441601abc023d58e2fd0b1dfb9f88b865267188de85f88c01dc91fa6f
8-
HEAD_REF master
8+
HEAD_REF main
99
)
1010

1111
vcpkg_cmake_configure(

‎wiki/MainPage.adoc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
= Istallation
22
:package_name: utki
33

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

0 commit comments

Comments
 (0)