From 5c1a3f7cf56fbcdc505a00104073d7472f1d440c Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Wed, 6 Sep 2023 22:37:21 -0400 Subject: [PATCH] feat: upgrade test suite from ubuntu 20.04 to 22.04 --- .github/workflows/ci.yml | 4 ++-- .github/workflows/tagged-release.yml | 2 +- Makefile | 2 +- Vagrantfile | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 06f39ab..3e5bd0b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,7 +17,7 @@ concurrency: jobs: unit-tests-master: name: unit-tests - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 env: DOKKU_VERSION: master @@ -59,7 +59,7 @@ jobs: unit-tests-0_19_0: name: unit-tests-0.19.0 - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 env: DOKKU_TAG: v0.19.0 diff --git a/.github/workflows/tagged-release.yml b/.github/workflows/tagged-release.yml index 846c457..0d7a4fb 100644 --- a/.github/workflows/tagged-release.yml +++ b/.github/workflows/tagged-release.yml @@ -10,7 +10,7 @@ on: jobs: tagged-release: name: tagged-release - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - uses: "marvinpinto/action-automatic-releases@v1.2.1" diff --git a/Makefile b/Makefile index 863c1ba..a4ece21 100644 --- a/Makefile +++ b/Makefile @@ -21,7 +21,7 @@ ifneq ($(shell shellcheck --version >/dev/null 2>&1 ; echo $$?),0) ifeq ($(SYSTEM_NAME),darwin) brew install shellcheck else - sudo add-apt-repository 'deb http://archive.ubuntu.com/ubuntu trusty-backports main restricted universe multiverse' + sudo add-apt-repository 'deb http://archive.ubuntu.com/ubuntu jammy-backports main restricted universe multiverse' sudo rm -rf /var/lib/apt/lists/* && sudo apt-get clean sudo apt-get update -qq && sudo apt-get install -qq -y shellcheck endif diff --git a/Vagrantfile b/Vagrantfile index 4aec135..093340f 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -1,7 +1,7 @@ # -*- mode: ruby -*- # vi: set ft=ruby : -BOX_NAME = ENV["BOX_NAME"] || "bento/ubuntu-20.04" +BOX_NAME = ENV["BOX_NAME"] || "bento/ubuntu-22.04" BOX_MEMORY = ENV["BOX_MEMORY"] || "2048" DOKKU_VERSION = "master"