From 8a28983c20ceb4894ab83f23248cc2e531bcae1e Mon Sep 17 00:00:00 2001 From: Ryan Date: Thu, 21 Apr 2022 22:29:27 +0200 Subject: [PATCH] feat: ubuntu-2204 (#52) * feat: ubuntu-2204 * remove unnecessary git-lfs install --- .github/workflows/build-ubuntu.yml | 2 ++ linux/ubuntu/scripts/act.sh | 8 +------- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build-ubuntu.yml b/.github/workflows/build-ubuntu.yml index 83c0e7c..6de78e0 100644 --- a/.github/workflows/build-ubuntu.yml +++ b/.github/workflows/build-ubuntu.yml @@ -42,6 +42,7 @@ jobs: - linux/amd64,linux/arm64,linux/armhf TAG: - latest + - 22.04 - 20.04 - 18.04 steps: @@ -211,6 +212,7 @@ jobs: matrix: TAG: - latest + - 22.04 - 20.04 - 18.04 PLATFORMS: diff --git a/linux/ubuntu/scripts/act.sh b/linux/ubuntu/scripts/act.sh index e66e8f8..c151cea 100755 --- a/linux/ubuntu/scripts/act.sh +++ b/linux/ubuntu/scripts/act.sh @@ -75,7 +75,7 @@ apt-get install -y git-lfs LSB_OS_VERSION="${VERSION_ID//\./}" echo "LSB_OS_VERSION=${LSB_OS_VERSION}" | tee -a "/etc/environment" -wget -qO "/imagegeneration/toolset.json" "https://raw.githubusercontent.com/actions/virtual-environments/main/images/linux/toolsets/toolset-${LSB_OS_VERSION}.json" +wget -qO "/imagegeneration/toolset.json" "https://raw.githubusercontent.com/actions/virtual-environments/main/images/linux/toolsets/toolset-${LSB_OS_VERSION}.json" || echo "File not available" wget -qO "/imagegeneration/LICENSE" "https://raw.githubusercontent.com/actions/virtual-environments/main/LICENSE" if [ "$(uname -m)" = x86_64 ]; then @@ -83,12 +83,6 @@ if [ "$(uname -m)" = x86_64 ]; then chmod +x "/usr/bin/jq" fi -if [[ "${VERSION_ID}" == "16.04" ]]; then - printf 'git-lfs not available for Xenial' -else - apt-get -yq install --no-install-recommends --no-install-suggests git-lfs -fi - printf "\n\tšŸ‹ Updated apt lists and upgraded packages šŸ‹\t\n" printf "\n\tšŸ‹ Creating ~/.ssh and adding 'github.com' šŸ‹\t\n"