From b647b2c3f64ccbecc0437b80112be7578575b358 Mon Sep 17 00:00:00 2001 From: Ryan Date: Wed, 22 Sep 2021 19:43:58 +0000 Subject: [PATCH] Remove ubuntu-16.04 and add missing links for nix/go (#821) * fix: remove ubuntu-16.04 * fix: add missing links for nix/go * fix: remove specific platform versions --- cmd/platforms.go | 11 +++-------- cmd/root.go | 4 ++-- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/cmd/platforms.go b/cmd/platforms.go index d7e9d54f..1e8bb5c5 100644 --- a/cmd/platforms.go +++ b/cmd/platforms.go @@ -6,14 +6,9 @@ import ( func (i *Input) newPlatforms() map[string]string { platforms := map[string]string{ - "ubuntu-latest": "node:12-buster-slim", - "ubuntu-20.04": "node:12-buster-slim", - "ubuntu-18.04": "node:12-buster-slim", - "ubuntu-16.04": "node:12-stretch-slim", - "windows-latest": "", - "windows-2019": "", - "macos-latest": "", - "macos-10.15": "", + "ubuntu-latest": "node:12-buster-slim", + "ubuntu-20.04": "node:12-buster-slim", + "ubuntu-18.04": "node:12-buster-slim", } for _, p := range i.platforms { diff --git a/cmd/root.go b/cmd/root.go index d37b33e0..07dce507 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -310,9 +310,9 @@ func defaultImageSurvey(actrc string) error { case "Large": option = "-P ubuntu-latest=ghcr.io/catthehacker/ubuntu:full-latest\n-P ubuntu-latest=ghcr.io/catthehacker/ubuntu:full-20.04\n-P ubuntu-18.04=ghcr.io/catthehacker/ubuntu:full-18.04\n" case "Medium": - option = "-P ubuntu-latest=ghcr.io/catthehacker/ubuntu:act-latest\n-P ubuntu-20.04=ghcr.io/catthehacker/ubuntu:act-20.04\n-P ubuntu-18.04=ghcr.io/catthehacker/ubuntu:act-18.04\n-P ubuntu-16.04=ghcr.io/catthehacker/ubuntu:act-16.04\n" + option = "-P ubuntu-latest=ghcr.io/catthehacker/ubuntu:act-latest\n-P ubuntu-20.04=ghcr.io/catthehacker/ubuntu:act-20.04\n-P ubuntu-18.04=ghcr.io/catthehacker/ubuntu:act-18.04\n" case "Micro": - option = "-P ubuntu-latest=node:12-buster-slim\n-P ubuntu-20.04=node:12-buster-slim\n-P ubuntu-18.04=node:12-buster-slim\n-P ubuntu-16.04=node:12-stretch-slim\n" + option = "-P ubuntu-latest=node:12-buster-slim\n-P ubuntu-20.04=node:12-buster-slim\n-P ubuntu-18.04=node:12-buster-slim\n" } f, err := os.Create(actrc)