Skip to content

Commit b5664c2

Browse files
authored
Merge pull request #31 from krzk/ci-clean
Ci clean
2 parents 85f8023 + b55f011 commit b5664c2

File tree

3 files changed

+13
-15
lines changed

3 files changed

+13
-15
lines changed

.github/workflows/ci.yml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -56,86 +56,86 @@ jobs:
5656
arch: i386
5757
compiler: gcc -m32
5858
cross_compile: i686-linux-gnu
59-
variant: i386
6059
pkg_config_path: /usr/lib/i386-linux-gnu/pkgconfig
60+
variant: i386
6161

6262
- container: "debian:stable"
6363
arch: i386
6464
compiler: gcc -m32
6565
cross_compile: i686-linux-gnu
66-
variant: i386
6766
pkg_config_path: /usr/lib/i386-linux-gnu/pkgconfig
67+
variant: i386
6868

6969
- container: "debian:bookworm"
7070
arch: i386
7171
compiler: gcc -m32
7272
cross_compile: i686-linux-gnu
73-
variant: i386
7473
pkg_config_path: /usr/lib/i386-linux-gnu/pkgconfig
74+
variant: i386
7575

7676
- container: "debian:buster"
7777
arch: i386
7878
compiler: gcc -m32
7979
cross_compile: i686-linux-gnu
80-
variant: i386
8180
pkg_config_path: /usr/lib/i386-linux-gnu/pkgconfig
81+
variant: i386
8282

8383
# Debian cross compilation builds
8484
- container: "debian:testing"
8585
arch: armhf
8686
compiler: arm-linux-gnueabihf-gcc
8787
cross_compile: arm-linux-gnueabihf
88-
variant: cross-compile
8988
pkg_config_path: /usr/lib/arm-linux-gnueabihf/pkgconfig
89+
variant: cross-compile
9090

9191
- container: "debian:testing"
9292
arch: arm64
9393
compiler: aarch64-linux-gnu-gcc
9494
cross_compile: aarch64-linux-gnu
95-
variant: cross-compile
9695
pkg_config_path: /usr/lib/aarch64-linux-gnu/pkgconfig
96+
variant: cross-compile
9797

9898
- container: "debian:testing"
9999
arch: ppc64el
100100
compiler: powerpc64le-linux-gnu-gcc
101101
cross_compile: powerpc64le-linux-gnu
102-
variant: cross-compile
103102
pkg_config_path: /usr/lib/powerpc64le-linux-gnu/pkgconfig
103+
variant: cross-compile
104104

105105
- container: "debian:testing"
106106
arch: s390x
107107
compiler: s390x-linux-gnu-gcc
108108
cross_compile: s390x-linux-gnu
109-
variant: cross-compile
110109
pkg_config_path: /usr/lib/s390x-linux-gnu/pkgconfig
110+
variant: cross-compile
111111

112112
- container: "debian:stable"
113113
arch: armhf
114114
compiler: arm-linux-gnueabihf-gcc
115115
cross_compile: arm-linux-gnueabihf
116-
variant: cross-compile
117116
pkg_config_path: /usr/lib/arm-linux-gnueabihf/pkgconfig
117+
variant: cross-compile
118118

119119
- container: "debian:stable"
120120
arch: arm64
121121
compiler: aarch64-linux-gnu-gcc
122122
cross_compile: aarch64-linux-gnu
123-
variant: cross-compile
124123
pkg_config_path: /usr/lib/aarch64-linux-gnu/pkgconfig
124+
variant: cross-compile
125125

126126
- container: "debian:stable"
127127
arch: ppc64el
128128
compiler: powerpc64le-linux-gnu-gcc
129129
cross_compile: powerpc64le-linux-gnu
130-
variant: cross-compile
131130
pkg_config_path: /usr/lib/powerpc64le-linux-gnu/pkgconfig
131+
variant: cross-compile
132132

133133
- container: "debian:stable"
134134
arch: s390x
135135
compiler: s390x-linux-gnu-gcc
136136
cross_compile: s390x-linux-gnu
137-
variant: cross-compile
138137
pkg_config_path: /usr/lib/s390x-linux-gnu/pkgconfig
138+
variant: cross-compile
139139

140140
container:
141141
image: ${{ matrix.container }}
@@ -144,8 +144,8 @@ jobs:
144144
CC: ${{ matrix.compiler }}
145145
CROSS_COMPILE: ${{ matrix.cross_compile }}
146146
MODE: ${{ matrix.mode }}
147-
VARIANT: ${{ matrix.variant }}
148147
PKG_CONFIG_PATH: ${{ matrix.pkg_config_path }}
148+
VARIANT: ${{ matrix.variant }}
149149

150150
steps:
151151
- name: Show OS

ci/ubuntu.i386.sh

Lines changed: 0 additions & 1 deletion
This file was deleted.

ci/ubuntu.sanitizers.sh

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)