Skip to content

Commit 6c916a3

Browse files
author
Matthew John Cheetham
authored
ci: add Mariner and Arch Linux (#1747)
After dropping the now-obsolete `tgagor/centos-stream` value from the matrix in #1746, let's now instead add the "somewhat" supported Mariner Linux and Arch Linux to the testing matrix.
2 parents 2bc4b4a + 41a26cf commit 6c916a3

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

.github/workflows/validate-install-from-source.yml

+5
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,18 @@ jobs:
2727
- image: opensuse/leap
2828
- image: opensuse/tumbleweed
2929
- image: registry.suse.com/suse/sle15:15.4.27.11.31
30+
- image: archlinux
31+
- image: mcr.microsoft.com/cbl-mariner/base/core:2.0
3032
container: ${{matrix.vector.image}}
3133
steps:
3234
- run: |
3335
if [[ ${{matrix.vector.image}} == *"suse"* ]]; then
3436
zypper -n install tar gzip
3537
elif [[ ${{matrix.vector.image}} == *"centos"* ]]; then
3638
dnf install which -y
39+
elif [[ ${{matrix.vector.image}} == *"mariner"* ]]; then
40+
GNUPGHOME=/root/.gnupg tdnf update -y &&
41+
GNUPGHOME=/root/.gnupg tdnf install tar -y # needed for `actions/checkout`
3742
fi
3843
3944
- uses: actions/checkout@v4

src/linux/Packaging.Linux/install-from-source.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ install_packages() {
6363

6464
for package in $packages; do
6565
# Ensure we don't stomp on existing installations.
66-
if [ ! -z $(which $package) ]; then
66+
if type $package >/dev/null 2>&1; then
6767
continue
6868
fi
6969

@@ -228,7 +228,7 @@ case "$distribution" in
228228
$sudo_cmd tdnf update -y
229229

230230
# Install dotnet/GCM dependencies.
231-
install_packages tdnf install "curl git krb5-libs libicu openssl-libs zlib findutils which bash"
231+
install_packages tdnf install "curl ca-certificates git krb5-libs libicu openssl-libs zlib findutils which bash awk"
232232

233233
ensure_dotnet_installed
234234
;;

0 commit comments

Comments
 (0)