Skip to content

Commit 7885a09

Browse files
committed
master -> main
1 parent b70b498 commit 7885a09

File tree

3 files changed

+17
-16
lines changed

3 files changed

+17
-16
lines changed

.github/workflows/ci.yml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -42,22 +42,22 @@ jobs:
4242
# configure timezone to avoid 'tzdata' package to require user interaction during installation (needed for ubuntu:focal)
4343
TZ=Europe/Helsinki ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
4444
- name: add cppfw deb repo
45-
uses: myci-actions/add-deb-repo@master
45+
uses: myci-actions/add-deb-repo@main
4646
with:
4747
repo: deb https://gagis.hopto.org/repo/cppfw/${{ matrix.os }} ${{ matrix.codename }} main
4848
repo-name: cppfw
4949
keys-asc: https://gagis.hopto.org/repo/cppfw/pubkey.gpg
5050
install: myci git devscripts equivs
5151
- name: add llvm repo (for clang-format)
52-
uses: myci-actions/add-deb-repo@master
52+
uses: myci-actions/add-deb-repo@main
5353
with:
5454
repo: deb https://apt.llvm.org/${{ matrix.codename }} llvm-toolchain-${{ matrix.codename }} main
5555
repo-name: llvm
5656
keys-asc: https://apt.llvm.org/llvm-snapshot.gpg.key
5757
- name: git clone
58-
uses: myci-actions/checkout@master
58+
uses: myci-actions/checkout@main
5959
- name: set PACKAGE_VERSION
60-
uses: myci-actions/export-env-var@master
60+
uses: myci-actions/export-env-var@main
6161
with: {name: PACKAGE_VERSION, value: $(myci-deb-version.sh debian/changelog)}
6262
- name: prepare debian package
6363
run: myci-deb-prepare.sh
@@ -86,7 +86,7 @@ jobs:
8686
rm -rf /usr/local/bin/python3*
8787
rm -rf /usr/local/bin/python3*-config
8888
- name: git clone
89-
uses: myci-actions/checkout@master
89+
uses: myci-actions/checkout@main
9090
- name: install clang-tidy and clang-format
9191
run: |
9292
brew install llvm
@@ -100,16 +100,16 @@ jobs:
100100
- name: install ci tools
101101
run: brew install myci make
102102
- name: set PATH to use latest make
103-
uses: myci-actions/export-env-var@master
103+
uses: myci-actions/export-env-var@main
104104
with: {name: PATH, value: "$HOMEBREW_PREFIX/opt/make/libexec/gnubin:$PATH"}
105105
- name: set CFLAGS
106-
uses: myci-actions/export-env-var@master
106+
uses: myci-actions/export-env-var@main
107107
with: {name: CFLAGS, value: "-isystem $HOMEBREW_PREFIX/include $CFLAGS"}
108108
- name: set CXXFLAGS
109-
uses: myci-actions/export-env-var@master
109+
uses: myci-actions/export-env-var@main
110110
with: {name: CXXFLAGS, value: "-isystem $HOMEBREW_PREFIX/include $CXXFLAGS"}
111111
- name: set LDFLAGS
112-
uses: myci-actions/export-env-var@master
112+
uses: myci-actions/export-env-var@main
113113
with: {name: LDFLAGS, value: "-L $HOMEBREW_PREFIX/lib $LDFLAGS"}
114114
- name: install deps
115115
run: myci-brew-install.sh `myci-list-deps-homebrew.sh`
@@ -143,22 +143,22 @@ jobs:
143143
msys2-devel
144144
mingw-w64-${{ matrix.arch }}-toolchain
145145
- name: add cppfw pacman msys repo
146-
uses: myci-actions/add-pacman-repo@master
146+
uses: myci-actions/add-pacman-repo@main
147147
with:
148148
name: cppfw_msys
149149
url: https://gagis.hopto.org/repo/cppfw/msys2/msys
150150
shell: 'msys2 {0}'
151151
key-server: https://gagis.hopto.org/repo/cppfw/pubkey.gpg
152152
install: myci
153153
- name: add cppfw pacman msys/mingw repo
154-
uses: myci-actions/add-pacman-repo@master
154+
uses: myci-actions/add-pacman-repo@main
155155
with:
156156
name: cppfw_${{ matrix.repo }}
157157
url: https://gagis.hopto.org/repo/cppfw/msys2/${{ matrix.repo }}
158158
shell: 'msys2 {0}'
159159
key-server: https://gagis.hopto.org/repo/cppfw/pubkey.gpg
160160
- name: git clone
161-
uses: myci-actions/checkout@master
161+
uses: myci-actions/checkout@main
162162
- name: prepare pacman package
163163
run: myci-apply-version.sh -v $(myci-deb-version.sh debian/changelog) msys2/PKGBUILD.in
164164
- name: build
@@ -184,7 +184,7 @@ jobs:
184184
- name: git clone
185185
uses: actions/checkout@v2
186186
- name: install CoAPP tools
187-
uses: myci-actions/install-coapp-tools@master
187+
uses: myci-actions/install-coapp-tools@main
188188
- name: nuget update
189189
run: |
190190
nuget restore msvs_solution/msvs_solution.sln
@@ -194,7 +194,7 @@ jobs:
194194
- name: build
195195
run: .\nuget\build_nuget.ps1
196196
- name: deploy
197-
uses: myci-actions/publish-nuget@master
197+
uses: myci-actions/publish-nuget@main
198198
with:
199199
filename: '.\nuget\*.nupkg'
200200
api-key: ${{ secrets.NUGET_DOT_ORG_API_KEY }}

.gitmodules

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

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: OpenGL renderer for ruis C++ GUI library;
1919
authors: {Ivan Gagis};
2020
owners: {Ivan Gagis};
21-
licenseUrl: "https://raw.githubusercontent.com/cppfw/ruis-render-opengl/master/LICENSE";
21+
licenseUrl: "https://raw.githubusercontent.com/cppfw/ruis-render-opengl/main/LICENSE";
2222
projectUrl: "https://github.com/cppfw/ruis-render-opengl";
23-
iconUrl: "https://github.com/cppfw/ruis-render-opengl/blob/master/logo.svg";
23+
iconUrl: "https://github.com/cppfw/ruis-render-opengl/blob/main/logo.svg";
2424
requireLicenseAcceptance:false;
2525
summary: OpenGL renderer for ruis C++ GUI library;
2626

0 commit comments

Comments
 (0)