Skip to content

Commit

Permalink
ci: add Mariner and Arch Linux (#1747)
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
Matthew John Cheetham authored Oct 22, 2024
2 parents 2bc4b4a + 41a26cf commit 6c916a3
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 2 deletions.
5 changes: 5 additions & 0 deletions .github/workflows/validate-install-from-source.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,18 @@ jobs:
- image: opensuse/leap
- image: opensuse/tumbleweed
- image: registry.suse.com/suse/sle15:15.4.27.11.31
- image: archlinux
- image: mcr.microsoft.com/cbl-mariner/base/core:2.0
container: ${{matrix.vector.image}}
steps:
- run: |
if [[ ${{matrix.vector.image}} == *"suse"* ]]; then
zypper -n install tar gzip
elif [[ ${{matrix.vector.image}} == *"centos"* ]]; then
dnf install which -y
elif [[ ${{matrix.vector.image}} == *"mariner"* ]]; then
GNUPGHOME=/root/.gnupg tdnf update -y &&
GNUPGHOME=/root/.gnupg tdnf install tar -y # needed for `actions/checkout`
fi
- uses: actions/checkout@v4
Expand Down
4 changes: 2 additions & 2 deletions src/linux/Packaging.Linux/install-from-source.sh
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ install_packages() {

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

Expand Down Expand Up @@ -228,7 +228,7 @@ case "$distribution" in
$sudo_cmd tdnf update -y

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

ensure_dotnet_installed
;;
Expand Down

0 comments on commit 6c916a3

Please sign in to comment.