Skip to content

Commit 0e1f8cf

Browse files
igagisigagis
committed
master -> main
1 parent 9eac1b4 commit 0e1f8cf

File tree

3 files changed

+37
-44
lines changed

3 files changed

+37
-44
lines changed

‎.github/workflows/ci.yml

Lines changed: 27 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -19,19 +19,20 @@ jobs:
1919
# - {os: debian, codename: buster, image_owner: , package_type: deb}
2020
# - {os: debian, codename: buster, image_owner: i386/, package_type: deb, labels: [i386,docker]}
2121
# - {os: debian, codename: buster, image_owner: arm32v7/, package_type: deb, labels: [arm,docker]}
22-
- {os: debian, codename: bullseye, image_owner: , package_type: deb}
22+
# - {os: debian, codename: bullseye, image_owner: , package_type: deb}
2323
# - {os: debian, codename: bullseye, image_owner: i386/, package_type: deb, labels: [i386,docker]}
24-
- {os: debian, codename: bullseye, image_owner: arm32v7/, package_type: deb, labels: [arm,docker]}
25-
- {os: debian, codename: bullseye, image_owner: arm64v8/, package_type: deb, labels: [arm64,docker]}
24+
# - {os: debian, codename: bullseye, image_owner: arm32v7/, package_type: deb, labels: [arm,docker]}
25+
# - {os: debian, codename: bullseye, image_owner: arm64v8/, package_type: deb, labels: [arm64,docker]}
2626
- {os: debian, codename: bookworm, image_owner: , package_type: deb}
2727
# - {os: debian, codename: bookworm, image_owner: i386/, package_type: deb, labels: [i386,docker]}
28-
- {os: debian, codename: bookworm, image_owner: arm32v7/, package_type: deb, labels: [arm,docker]}
28+
- {os: debian, codename: bookworm, image_owner: arm32v7/, package_type: deb, labels: [arm32,docker]}
2929
- {os: debian, codename: bookworm, image_owner: arm64v8/, package_type: deb, labels: [arm64,docker]}
30-
- {os: ubuntu, codename: focal, image_owner: , package_type: deb}
31-
- {os: ubuntu, codename: jammy, image_owner: , package_type: deb}
30+
# - {os: ubuntu, codename: focal, image_owner: , package_type: deb}
31+
# - {os: ubuntu, codename: jammy, image_owner: , package_type: deb}
32+
- {os: ubuntu, codename: noble, image_owner: , package_type: deb}
3233
# - {os: raspbian, codename: buster, image_owner: igagis/, package_type: deb, labels: [arm,docker]}
33-
- {os: raspbian, codename: bullseye, image_owner: igagis/, package_type: deb, labels: [arm,docker]}
34-
- {os: raspbian, codename: bookworm, image_owner: igagis/, package_type: deb, labels: [arm,docker]}
34+
# - {os: raspbian, codename: bullseye, image_owner: igagis/, package_type: deb, labels: [arm,docker]}
35+
- {os: raspbian, codename: bookworm, image_owner: igagis/, package_type: deb, labels: [arm32,docker]}
3536
runs-on: ${{ (matrix.labels == '' && 'ubuntu-latest') || matrix.labels }}
3637
container: ${{ matrix.image_owner }}${{ matrix.os }}:${{ matrix.codename }}
3738
name: linux - ${{ matrix.image_owner }}${{ matrix.os }}:${{ matrix.codename }}
@@ -41,16 +42,16 @@ jobs:
4142
# configure timezone to avoid 'tzdata' package to require user interaction during installation (needed for ubuntu:focal)
4243
TZ=Europe/Helsinki ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
4344
- name: add cppfw deb repo
44-
uses: myci-actions/add-deb-repo@master
45+
uses: myci-actions/add-deb-repo@main
4546
with:
4647
repo: deb https://gagis.hopto.org/repo/cppfw/${{ matrix.os }} ${{ matrix.codename }} main
4748
repo-name: cppfw
4849
key-server: https://gagis.hopto.org/repo/cppfw/pubkey.gpg
4950
install: myci git devscripts equivs
5051
- name: git clone
51-
uses: myci-actions/checkout@master
52+
uses: myci-actions/checkout@main
5253
- name: set PACKAGE_VERSION
53-
uses: myci-actions/export-env-var@master
54+
uses: myci-actions/export-env-var@main
5455
with: {name: PACKAGE_VERSION, value: $(myci-deb-version.sh debian/changelog)}
5556
- name: prepare debian package
5657
run: myci-deb-prepare.sh
@@ -77,24 +78,24 @@ jobs:
7778
rm -rf /usr/local/bin/python3*
7879
rm -rf /usr/local/bin/python3*-config
7980
- name: git clone
80-
uses: myci-actions/checkout@master
81+
uses: myci-actions/checkout@main
8182
- name: add cppfw tap
8283
run: |
8384
brew tap cppfw/tap
8485
brew update
8586
- name: install ci tools
8687
run: brew install myci make
8788
- name: set PATH to use latest make
88-
uses: myci-actions/export-env-var@master
89+
uses: myci-actions/export-env-var@main
8990
with: {name: PATH, value: "$HOMEBREW_PREFIX/opt/make/libexec/gnubin:$PATH"}
9091
- name: set CFLAGS
91-
uses: myci-actions/export-env-var@master
92+
uses: myci-actions/export-env-var@main
9293
with: {name: CFLAGS, value: "-isystem $HOMEBREW_PREFIX/include $CFLAGS"}
9394
- name: set CXXFLAGS
94-
uses: myci-actions/export-env-var@master
95+
uses: myci-actions/export-env-var@main
9596
with: {name: CXXFLAGS, value: "-isystem $HOMEBREW_PREFIX/include $CXXFLAGS"}
9697
- name: set LDFLAGS
97-
uses: myci-actions/export-env-var@master
98+
uses: myci-actions/export-env-var@main
9899
with: {name: LDFLAGS, value: "-L $HOMEBREW_PREFIX/lib $LDFLAGS"}
99100
- name: install deps
100101
run: myci-brew-install.sh `myci-list-deps-homebrew.sh`
@@ -125,9 +126,9 @@ jobs:
125126
- name: install ci tools
126127
run: brew install myci
127128
- name: git clone
128-
uses: myci-actions/checkout@master
129+
uses: myci-actions/checkout@main
129130
- name: set PACKAGE_VERSION
130-
uses: myci-actions/export-env-var@master
131+
uses: myci-actions/export-env-var@main
131132
with: {name: PACKAGE_VERSION, value: $(myci-deb-version.sh debian/changelog)}
132133
- name: add cocoapods repo
133134
run: pod repo add --silent cppfw https://[email protected]/cppfw/cocoapods-repo.git
@@ -157,16 +158,16 @@ jobs:
157158
container: mingc/android-build-box:latest
158159
steps:
159160
- name: git clone
160-
uses: myci-actions/checkout@master
161+
uses: myci-actions/checkout@main
161162
- name: add cppfw deb repo
162-
uses: myci-actions/add-deb-repo@master
163+
uses: myci-actions/add-deb-repo@main
163164
with:
164165
repo: deb https://gagis.hopto.org/repo/cppfw/$(lsb_release --id --short | tr '[:upper:]' '[:lower:]') $(lsb_release --codename --short) main
165166
repo-name: cppfw
166167
key-server: https://gagis.hopto.org/repo/cppfw/pubkey.gpg
167168
install: myci
168169
- name: set PACKAGE_VERSION
169-
uses: myci-actions/export-env-var@master
170+
uses: myci-actions/export-env-var@main
170171
with: {name: PACKAGE_VERSION, value: $(myci-deb-version.sh debian/changelog)}
171172
- name: build
172173
run: |
@@ -200,22 +201,22 @@ jobs:
200201
msys2-devel
201202
mingw-w64-${{ matrix.arch }}-toolchain
202203
- name: add cppfw pacman msys repo
203-
uses: myci-actions/add-pacman-repo@master
204+
uses: myci-actions/add-pacman-repo@main
204205
with:
205206
name: cppfw_msys
206207
url: https://gagis.hopto.org/repo/cppfw/msys2/msys
207208
shell: 'msys2 {0}'
208209
key-server: https://gagis.hopto.org/repo/cppfw/pubkey.gpg
209210
install: myci
210211
- name: add cppfw pacman msys/mingw repo
211-
uses: myci-actions/add-pacman-repo@master
212+
uses: myci-actions/add-pacman-repo@main
212213
with:
213214
name: cppfw_${{ matrix.repo }}
214215
url: https://gagis.hopto.org/repo/cppfw/msys2/${{ matrix.repo }}
215216
shell: 'msys2 {0}'
216217
key-server: https://gagis.hopto.org/repo/cppfw/pubkey.gpg
217218
- name: git clone
218-
uses: myci-actions/checkout@master
219+
uses: myci-actions/checkout@main
219220
- name: prepare pacman package
220221
run: myci-apply-version.sh -v $(myci-deb-version.sh debian/changelog) msys2/PKGBUILD.in
221222
- name: build
@@ -241,7 +242,7 @@ jobs:
241242
- name: git clone
242243
uses: actions/checkout@v2
243244
- name: install CoAPP tools
244-
uses: myci-actions/install-coapp-tools@master
245+
uses: myci-actions/install-coapp-tools@main
245246
- name: nuget update
246247
run: |
247248
nuget restore msvs_solution/msvs_solution.sln
@@ -251,7 +252,7 @@ jobs:
251252
- name: build
252253
run: .\nuget\build_nuget.ps1
253254
- name: deploy
254-
uses: myci-actions/publish-nuget@master
255+
uses: myci-actions/publish-nuget@main
255256
with:
256257
filename: '.\nuget\*.nupkg'
257258
api-key: ${{ secrets.NUGET_DOT_ORG_API_KEY }}

‎nuget/build_nuget.ps1

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

40-
msbuild /m ../msvs_solution/msvs_solution.sln /t:Rebuild /p:Configuration=v142_Debug_MD /p:Platform=x86 /v:minimal /nologo
41-
If(!$?){exit 1}
42-
msbuild /m ../msvs_solution/msvs_solution.sln /t:Rebuild /p:Configuration=v142_Release_MD /p:Platform=x86 /v:minimal /nologo
43-
If(!$?){exit 1}
44-
msbuild /m ../msvs_solution/msvs_solution.sln /t:Rebuild /p:Configuration=v142_Debug_MD /p:Platform=x64 /v:minimal /nologo
45-
If(!$?){exit 1}
46-
msbuild /m ../msvs_solution/msvs_solution.sln /t:Rebuild /p:Configuration=v142_Release_MD /p:Platform=x64 /v:minimal /nologo
47-
If(!$?){exit 1}
48-
# msbuild /m ../msvs_solution/msvs_solution.sln /t:Rebuild /p:Configuration=v142_Debug_MT /p:Platform=x86 /v:minimal /nologo
49-
# If(!$?){exit 1}
50-
# msbuild /m ../msvs_solution/msvs_solution.sln /t:Rebuild /p:Configuration=v142_Release_MT /p:Platform=x86 /v:minimal /nologo
51-
# If(!$?){exit 1}
52-
# msbuild /m ../msvs_solution/msvs_solution.sln /t:Rebuild /p:Configuration=v142_Debug_MT /p:Platform=x64 /v:minimal /nologo
53-
# If(!$?){exit 1}
54-
# msbuild /m ../msvs_solution/msvs_solution.sln /t:Rebuild /p:Configuration=v142_Release_MT /p:Platform=x64 /v:minimal /nologo
55-
# If(!$?){exit 1}
40+
msbuild /m ../msvs_solution/msvs_solution.sln /t:Rebuild /p:Configuration=v142_Debug_MD /p:Platform=x86 /v:minimal /nologo; If(!$?){exit 1}
41+
msbuild /m ../msvs_solution/msvs_solution.sln /t:Rebuild /p:Configuration=v142_Release_MD /p:Platform=x86 /v:minimal /nologo; If(!$?){exit 1}
42+
msbuild /m ../msvs_solution/msvs_solution.sln /t:Rebuild /p:Configuration=v142_Debug_MD /p:Platform=x64 /v:minimal /nologo; If(!$?){exit 1}
43+
msbuild /m ../msvs_solution/msvs_solution.sln /t:Rebuild /p:Configuration=v142_Release_MD /p:Platform=x64 /v:minimal /nologo; If(!$?){exit 1}
44+
# msbuild /m ../msvs_solution/msvs_solution.sln /t:Rebuild /p:Configuration=v142_Debug_MT /p:Platform=x86 /v:minimal /nologo; If(!$?){exit 1}
45+
# msbuild /m ../msvs_solution/msvs_solution.sln /t:Rebuild /p:Configuration=v142_Release_MT /p:Platform=x86 /v:minimal /nologo; If(!$?){exit 1}
46+
# msbuild /m ../msvs_solution/msvs_solution.sln /t:Rebuild /p:Configuration=v142_Debug_MT /p:Platform=x64 /v:minimal /nologo; If(!$?){exit 1}
47+
# msbuild /m ../msvs_solution/msvs_solution.sln /t:Rebuild /p:Configuration=v142_Release_MT /p:Platform=x64 /v:minimal /nologo; If(!$?){exit 1}
5648

5749
Write-NuGetPackage nuget.autopkg
5850
If(!$?){exit 1}

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

0 commit comments

Comments
 (0)