Skip to content

Commit aa47f5c

Browse files
committed
master -> main
1 parent adb5ed1 commit aa47f5c

File tree

2 files changed

+13
-13
lines changed

2 files changed

+13
-13
lines changed

.github/workflows/ci.yml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -33,16 +33,16 @@ jobs:
3333
# configure timezone to avoid 'tzdata' package to require user interaction during installation (needed for ubuntu:focal)
3434
TZ=Europe/Helsinki ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
3535
- name: add cppfw deb repo
36-
uses: myci-actions/add-deb-repo@master
36+
uses: myci-actions/add-deb-repo@main
3737
with:
3838
repo: deb https://gagis.hopto.org/repo/cppfw/${{ matrix.os }} ${{ matrix.codename }} main
3939
repo-name: cppfw
4040
keys-asc: https://gagis.hopto.org/repo/cppfw/pubkey.gpg
4141
install: git myci devscripts equivs
4242
- name: git clone
43-
uses: myci-actions/checkout@master
43+
uses: myci-actions/checkout@main
4444
- name: set PACKAGE_VERSION
45-
uses: myci-actions/export-env-var@master
45+
uses: myci-actions/export-env-var@main
4646
with: {name: PACKAGE_VERSION, value: $(myci-deb-version.sh debian/changelog)}
4747
- name: prepare debian package
4848
run: myci-deb-prepare.sh
@@ -72,17 +72,17 @@ jobs:
7272
run: |
7373
pacman --sync --refresh --sysupgrade --noconfirm --noprogressbar base-devel git
7474
- name: add cppfw pacman repo
75-
uses: myci-actions/add-pacman-repo@master
75+
uses: myci-actions/add-pacman-repo@main
7676
with:
7777
name: cppfw
7878
url: https://gagis.hopto.org/repo/cppfw/archlinux/${{ matrix.arch }}
7979
key-server: https://gagis.hopto.org/repo/cppfw/pubkey.gpg
8080
install: >-
8181
myci
8282
- name: git clone
83-
uses: myci-actions/checkout@master
83+
uses: myci-actions/checkout@main
8484
- name: set PACKAGE_VERSION
85-
uses: myci-actions/export-env-var@master
85+
uses: myci-actions/export-env-var@main
8686
with: {name: PACKAGE_VERSION, value: $(myci-deb-version.sh debian/changelog)}
8787
# makepkg needs to install dependency packages, so nobody user needs sudo rights
8888
- name: add nobody to sudoers
@@ -113,15 +113,15 @@ jobs:
113113
rm -rf /usr/local/bin/python3*
114114
rm -rf /usr/local/bin/python3*-config
115115
- name: git clone
116-
uses: myci-actions/checkout@master
116+
uses: myci-actions/checkout@main
117117
- name: add cppfw tap
118118
run: |
119119
brew tap cppfw/tap
120120
brew update
121121
- name: install ci tools
122122
run: brew install myci make
123123
- name: set PATH to use latest make
124-
uses: myci-actions/export-env-var@master
124+
uses: myci-actions/export-env-var@main
125125
with: {name: PATH, value: "$HOMEBREW_PREFIX/opt/make/libexec/gnubin:$PATH"}
126126
- name: install deps
127127
run: myci-brew-install.sh `myci-list-deps-homebrew.sh`
@@ -148,15 +148,15 @@ jobs:
148148
msys2-devel
149149
make
150150
- name: add cppfw pacman msys repo
151-
uses: myci-actions/add-pacman-repo@master
151+
uses: myci-actions/add-pacman-repo@main
152152
with:
153153
name: cppfw_msys
154154
url: https://gagis.hopto.org/repo/cppfw/msys2/msys
155155
shell: 'msys2 {0}'
156156
key-server: https://gagis.hopto.org/repo/cppfw/pubkey.gpg
157157
install: myci git
158158
- name: git clone
159-
uses: myci-actions/checkout@master
159+
uses: myci-actions/checkout@main
160160
- name: prepare pacman package
161161
run: myci-apply-version.sh -v $(myci-deb-version.sh debian/changelog) msys2/PKGBUILD.in
162162
- name: build
@@ -194,14 +194,14 @@ jobs:
194194
diffutils
195195
dos2unix
196196
- name: add cppfw pacman msys repo
197-
uses: myci-actions/add-pacman-repo@master
197+
uses: myci-actions/add-pacman-repo@main
198198
with:
199199
name: cppfw_msys
200200
url: https://gagis.hopto.org/repo/cppfw/msys2/msys
201201
shell: 'msys2 {0}'
202202
key-server: https://gagis.hopto.org/repo/cppfw/pubkey.gpg
203203
install: myci git
204204
- name: git clone
205-
uses: myci-actions/checkout@master
205+
uses: myci-actions/checkout@main
206206
- name: test
207207
run: make test

wiki/HomePage.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
== Installation
55
:package_name: prorab
66

7-
. Setup your OS-preferred package system repo following link:https://github.com/cppfw/wiki/blob/master/enable_repo/enable_repo.adoc[this manual]
7+
. Setup your OS-preferred package system repo following link:https://github.com/cppfw/wiki/blob/main/enable_repo/enable_repo.adoc[this manual]
88
. Install package
99
+
1010
- **deb** (Linux): `{package_name}`

0 commit comments

Comments
 (0)