ci: keep env variables ordered by name

Put 'pkg_config_path' before 'variant' so the environment variables are
ordered alphabetically.  No functional changes.

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
This commit is contained in:
Krzysztof Kozlowski
2023-09-22 21:17:15 +02:00
parent 85f802323c
commit 1353a029aa

View File

@@ -56,86 +56,86 @@ jobs:
arch: i386
compiler: gcc -m32
cross_compile: i686-linux-gnu
variant: i386
pkg_config_path: /usr/lib/i386-linux-gnu/pkgconfig
variant: i386
- container: "debian:stable"
arch: i386
compiler: gcc -m32
cross_compile: i686-linux-gnu
variant: i386
pkg_config_path: /usr/lib/i386-linux-gnu/pkgconfig
variant: i386
- container: "debian:bookworm"
arch: i386
compiler: gcc -m32
cross_compile: i686-linux-gnu
variant: i386
pkg_config_path: /usr/lib/i386-linux-gnu/pkgconfig
variant: i386
- container: "debian:buster"
arch: i386
compiler: gcc -m32
cross_compile: i686-linux-gnu
variant: i386
pkg_config_path: /usr/lib/i386-linux-gnu/pkgconfig
variant: i386
# Debian cross compilation builds
- container: "debian:testing"
arch: armhf
compiler: arm-linux-gnueabihf-gcc
cross_compile: arm-linux-gnueabihf
variant: cross-compile
pkg_config_path: /usr/lib/arm-linux-gnueabihf/pkgconfig
variant: cross-compile
- container: "debian:testing"
arch: arm64
compiler: aarch64-linux-gnu-gcc
cross_compile: aarch64-linux-gnu
variant: cross-compile
pkg_config_path: /usr/lib/aarch64-linux-gnu/pkgconfig
variant: cross-compile
- container: "debian:testing"
arch: ppc64el
compiler: powerpc64le-linux-gnu-gcc
cross_compile: powerpc64le-linux-gnu
variant: cross-compile
pkg_config_path: /usr/lib/powerpc64le-linux-gnu/pkgconfig
variant: cross-compile
- container: "debian:testing"
arch: s390x
compiler: s390x-linux-gnu-gcc
cross_compile: s390x-linux-gnu
variant: cross-compile
pkg_config_path: /usr/lib/s390x-linux-gnu/pkgconfig
variant: cross-compile
- container: "debian:stable"
arch: armhf
compiler: arm-linux-gnueabihf-gcc
cross_compile: arm-linux-gnueabihf
variant: cross-compile
pkg_config_path: /usr/lib/arm-linux-gnueabihf/pkgconfig
variant: cross-compile
- container: "debian:stable"
arch: arm64
compiler: aarch64-linux-gnu-gcc
cross_compile: aarch64-linux-gnu
variant: cross-compile
pkg_config_path: /usr/lib/aarch64-linux-gnu/pkgconfig
variant: cross-compile
- container: "debian:stable"
arch: ppc64el
compiler: powerpc64le-linux-gnu-gcc
cross_compile: powerpc64le-linux-gnu
variant: cross-compile
pkg_config_path: /usr/lib/powerpc64le-linux-gnu/pkgconfig
variant: cross-compile
- container: "debian:stable"
arch: s390x
compiler: s390x-linux-gnu-gcc
cross_compile: s390x-linux-gnu
variant: cross-compile
pkg_config_path: /usr/lib/s390x-linux-gnu/pkgconfig
variant: cross-compile
container:
image: ${{ matrix.container }}
@@ -144,8 +144,8 @@ jobs:
CC: ${{ matrix.compiler }}
CROSS_COMPILE: ${{ matrix.cross_compile }}
MODE: ${{ matrix.mode }}
VARIANT: ${{ matrix.variant }}
PKG_CONFIG_PATH: ${{ matrix.pkg_config_path }}
VARIANT: ${{ matrix.variant }}
steps:
- name: Show OS