Skip to content

Commit 0edac9b

Browse files
igagisigagis
committed
master -> main
1 parent 88f5251 commit 0edac9b

File tree

1 file changed

+24
-23
lines changed

1 file changed

+24
-23
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 24 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@ jobs:
1616
fail-fast: false
1717
matrix:
1818
include:
19-
- {os: debian, codename: bullseye, image_owner: , package_type: deb}
20-
- {os: debian, codename: bullseye, image_owner: arm32v7/, package_type: deb, labels: [arm,docker]}
19+
- {os: debian, codename: bookworm, image_owner: , package_type: deb}
20+
- {os: debian, codename: bookworm, image_owner: arm32v7/, package_type: deb, labels: [arm32,docker]}
2121
runs-on: ${{ (matrix.labels == '' && 'ubuntu-latest') || matrix.labels }}
2222
container: ${{ matrix.image_owner }}${{ matrix.os }}:${{ matrix.codename }}
2323
name: sanitizer - ${{ matrix.image_owner }}${{ matrix.os }}:${{ matrix.codename }}
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/${{ matrix.os }} ${{ matrix.codename }} main
2929
repo-name: cppfw
@@ -33,7 +33,7 @@ jobs:
3333
run: |
3434
apt install --assume-yes devscripts equivs
3535
- name: git clone
36-
uses: myci-actions/checkout@master
36+
uses: myci-actions/checkout@main
3737
- name: prepare debian package
3838
run: myci-deb-prepare.sh
3939
- name: install deps
@@ -51,19 +51,20 @@ jobs:
5151
# - {os: debian, codename: buster, image_owner: , package_type: deb}
5252
# - {os: debian, codename: buster, image_owner: i386/, package_type: deb, labels: [i386,docker]}
5353
# - {os: debian, codename: buster, image_owner: arm32v7/, package_type: deb, labels: [arm,docker]}
54-
- {os: debian, codename: bullseye, image_owner: , package_type: deb}
54+
# - {os: debian, codename: bullseye, image_owner: , package_type: deb}
5555
# - {os: debian, codename: bullseye, image_owner: i386/, package_type: deb, labels: [i386,docker]}
56-
- {os: debian, codename: bullseye, image_owner: arm32v7/, package_type: deb, labels: [arm,docker]}
57-
- {os: debian, codename: bullseye, image_owner: arm64v8/, package_type: deb, labels: [arm64,docker]}
56+
# - {os: debian, codename: bullseye, image_owner: arm32v7/, package_type: deb, labels: [arm,docker]}
57+
# - {os: debian, codename: bullseye, image_owner: arm64v8/, package_type: deb, labels: [arm64,docker]}
5858
- {os: debian, codename: bookworm, image_owner: , package_type: deb}
5959
# - {os: debian, codename: bookworm, image_owner: i386/, package_type: deb, labels: [i386,docker]}
60-
- {os: debian, codename: bookworm, image_owner: arm32v7/, package_type: deb, labels: [arm,docker]}
60+
- {os: debian, codename: bookworm, image_owner: arm32v7/, package_type: deb, labels: [arm32,docker]}
6161
- {os: debian, codename: bookworm, image_owner: arm64v8/, package_type: deb, labels: [arm64,docker]}
62-
- {os: ubuntu, codename: focal, image_owner: , package_type: deb}
63-
- {os: ubuntu, codename: jammy, image_owner: , package_type: deb}
62+
# - {os: ubuntu, codename: focal, image_owner: , package_type: deb}
63+
# - {os: ubuntu, codename: jammy, image_owner: , package_type: deb}
64+
- {os: ubuntu, codename: noble, image_owner: , package_type: deb}
6465
# - {os: raspbian, codename: buster, image_owner: igagis/, package_type: deb, labels: [arm,docker]}
65-
- {os: raspbian, codename: bullseye, image_owner: igagis/, package_type: deb, labels: [arm,docker]}
66-
- {os: raspbian, codename: bookworm, image_owner: igagis/, package_type: deb, labels: [arm,docker]}
66+
# - {os: raspbian, codename: bullseye, image_owner: igagis/, package_type: deb, labels: [arm,docker]}
67+
- {os: raspbian, codename: bookworm, image_owner: igagis/, package_type: deb, labels: [arm32,docker]}
6768
runs-on: ${{ (matrix.labels == '' && 'ubuntu-latest') || matrix.labels }}
6869
container: ${{ matrix.image_owner }}${{ matrix.os }}:${{ matrix.codename }}
6970
name: linux - ${{ matrix.image_owner }}${{ matrix.os }}:${{ matrix.codename }}
@@ -73,16 +74,16 @@ jobs:
7374
# configure timezone to avoid 'tzdata' package to require user interaction during installation (needed for ubuntu:focal)
7475
TZ=Europe/Helsinki ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
7576
- name: add cppfw deb repo
76-
uses: myci-actions/add-deb-repo@master
77+
uses: myci-actions/add-deb-repo@main
7778
with:
7879
repo: deb https://gagis.hopto.org/repo/cppfw/${{ matrix.os }} ${{ matrix.codename }} main
7980
repo-name: cppfw
8081
keys-asc: https://gagis.hopto.org/repo/cppfw/pubkey.gpg
8182
install: myci git devscripts equivs
8283
- name: git clone
83-
uses: myci-actions/checkout@master
84+
uses: myci-actions/checkout@main
8485
- name: set PACKAGE_VERSION
85-
uses: myci-actions/export-env-var@master
86+
uses: myci-actions/export-env-var@main
8687
with: {name: PACKAGE_VERSION, value: $(myci-deb-version.sh debian/changelog)}
8788
- name: prepare debian package
8889
run: myci-deb-prepare.sh
@@ -109,7 +110,7 @@ jobs:
109110
rm -rf /usr/local/bin/python3*
110111
rm -rf /usr/local/bin/python3*-config
111112
- name: git clone
112-
uses: myci-actions/checkout@master
113+
uses: myci-actions/checkout@main
113114
- name: install clang-tidy and clang-format
114115
run: |
115116
brew install llvm
@@ -123,16 +124,16 @@ jobs:
123124
- name: install ci tools
124125
run: brew install myci make
125126
- name: set PATH to use latest make
126-
uses: myci-actions/export-env-var@master
127+
uses: myci-actions/export-env-var@main
127128
with: {name: PATH, value: "$HOMEBREW_PREFIX/opt/make/libexec/gnubin:$PATH"}
128129
- name: set CFLAGS
129-
uses: myci-actions/export-env-var@master
130+
uses: myci-actions/export-env-var@main
130131
with: {name: CFLAGS, value: "-isystem $HOMEBREW_PREFIX/include $CFLAGS"}
131132
- name: set CXXFLAGS
132-
uses: myci-actions/export-env-var@master
133+
uses: myci-actions/export-env-var@main
133134
with: {name: CXXFLAGS, value: "-isystem $HOMEBREW_PREFIX/include $CXXFLAGS"}
134135
- name: set LDFLAGS
135-
uses: myci-actions/export-env-var@master
136+
uses: myci-actions/export-env-var@main
136137
with: {name: LDFLAGS, value: "-L $HOMEBREW_PREFIX/lib $LDFLAGS"}
137138
- name: install deps
138139
run: myci-brew-install.sh `myci-list-deps-homebrew.sh`
@@ -166,22 +167,22 @@ jobs:
166167
msys2-devel
167168
mingw-w64-${{ matrix.arch }}-toolchain
168169
- name: add cppfw pacman msys repo
169-
uses: myci-actions/add-pacman-repo@master
170+
uses: myci-actions/add-pacman-repo@main
170171
with:
171172
name: cppfw_msys
172173
url: https://gagis.hopto.org/repo/cppfw/msys2/msys
173174
shell: 'msys2 {0}'
174175
key-server: https://gagis.hopto.org/repo/cppfw/pubkey.gpg
175176
install: myci
176177
- name: add cppfw pacman msys/mingw repo
177-
uses: myci-actions/add-pacman-repo@master
178+
uses: myci-actions/add-pacman-repo@main
178179
with:
179180
name: cppfw_${{ matrix.repo }}
180181
url: https://gagis.hopto.org/repo/cppfw/msys2/${{ matrix.repo }}
181182
shell: 'msys2 {0}'
182183
key-server: https://gagis.hopto.org/repo/cppfw/pubkey.gpg
183184
- name: git clone
184-
uses: myci-actions/checkout@master
185+
uses: myci-actions/checkout@main
185186
- name: prepare pacman package
186187
run: myci-apply-version.sh --version $(myci-deb-version.sh debian/changelog) msys2/PKGBUILD.in
187188
- name: build

0 commit comments

Comments
 (0)