From 5a1fda5a90fb9c938e2e832fe7e732cc2c2d9e66 Mon Sep 17 00:00:00 2001 From: maflcko <6399679+maflcko@users.noreply.github.com> Date: Fri, 25 Oct 2024 11:16:52 +0200 Subject: [PATCH 01/13] Update .cirrus.yml --- .cirrus.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index d685749..9c655be 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -1,7 +1,8 @@ task: use_compute_credits: true - container: - image: ubuntu:18.04 + compute_engine_instance: # https://cirrus-ci.org/guide/custom-vms/#custom-compute-engine-vms + image_project: ubuntu-os-cloud + image: family/ubuntu-2004-lts # https://cloud.google.com/compute/docs/images/os-details#ubuntu_lts cpu: 1 memory: 2G timeout_in: 20m From 2c282eb1f94855e20f7c5f81771f8e820de05bf0 Mon Sep 17 00:00:00 2001 From: maflcko <6399679+maflcko@users.noreply.github.com> Date: Fri, 25 Oct 2024 11:21:22 +0200 Subject: [PATCH 02/13] Update .cirrus.yml --- .cirrus.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.cirrus.yml b/.cirrus.yml index 9c655be..83e46f0 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -1,4 +1,4 @@ -task: +task: #bla use_compute_credits: true compute_engine_instance: # https://cirrus-ci.org/guide/custom-vms/#custom-compute-engine-vms image_project: ubuntu-os-cloud From 31b471a5caf9f9f22b58ab953dff555fc988a2f5 Mon Sep 17 00:00:00 2001 From: maflcko <6399679+maflcko@users.noreply.github.com> Date: Fri, 25 Oct 2024 11:25:53 +0200 Subject: [PATCH 03/13] Update .cirrus.yml --- .cirrus.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.cirrus.yml b/.cirrus.yml index 83e46f0..9c655be 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -1,4 +1,4 @@ -task: #bla +task: use_compute_credits: true compute_engine_instance: # https://cirrus-ci.org/guide/custom-vms/#custom-compute-engine-vms image_project: ubuntu-os-cloud From 37d89691778d141f06fdd6351eae710c4e3edd13 Mon Sep 17 00:00:00 2001 From: maflcko <6399679+maflcko@users.noreply.github.com> Date: Fri, 25 Oct 2024 11:27:09 +0200 Subject: [PATCH 04/13] Update snapcraft.yaml --- snap/snapcraft.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index c3bdc28..25ef76b 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -8,7 +8,7 @@ description: | grade: stable confinement: strict -base: core18 +base: core20 apps: daemon: From 4703614516feb33a1554e0f23c16446eea680119 Mon Sep 17 00:00:00 2001 From: maflcko <6399679+maflcko@users.noreply.github.com> Date: Fri, 25 Oct 2024 11:32:41 +0200 Subject: [PATCH 05/13] Update .cirrus.yml --- .cirrus.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.cirrus.yml b/.cirrus.yml index 9c655be..d48e30f 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -2,7 +2,7 @@ task: use_compute_credits: true compute_engine_instance: # https://cirrus-ci.org/guide/custom-vms/#custom-compute-engine-vms image_project: ubuntu-os-cloud - image: family/ubuntu-2004-lts # https://cloud.google.com/compute/docs/images/os-details#ubuntu_lts + image: family/ubuntu-2404-lts # https://cloud.google.com/compute/docs/images/os-details#ubuntu_lts cpu: 1 memory: 2G timeout_in: 20m @@ -12,6 +12,7 @@ task: - apt-get update - apt-get install --no-install-recommends --no-upgrade -qq $DOCKER_PACKAGES snapcraft_pull_script: + - snap install multipass - snapcraft pull ci_script: - snapcraft From 925c091be6a158873e792db0eb23744226fcff04 Mon Sep 17 00:00:00 2001 From: maflcko <6399679+maflcko@users.noreply.github.com> Date: Fri, 25 Oct 2024 11:34:03 +0200 Subject: [PATCH 06/13] Update .cirrus.yml --- .cirrus.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.cirrus.yml b/.cirrus.yml index d48e30f..5d81463 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -2,7 +2,7 @@ task: use_compute_credits: true compute_engine_instance: # https://cirrus-ci.org/guide/custom-vms/#custom-compute-engine-vms image_project: ubuntu-os-cloud - image: family/ubuntu-2404-lts # https://cloud.google.com/compute/docs/images/os-details#ubuntu_lts + image: family/ubuntu-2404-lts-amd64 # https://cloud.google.com/compute/docs/images/os-details#ubuntu_lts cpu: 1 memory: 2G timeout_in: 20m From 83f77f803ed257b71ec57ad8b013ea4f9b09dcec Mon Sep 17 00:00:00 2001 From: maflcko <6399679+maflcko@users.noreply.github.com> Date: Fri, 25 Oct 2024 11:52:05 +0200 Subject: [PATCH 07/13] Update .cirrus.yml --- .cirrus.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 5d81463..be5a963 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -6,13 +6,11 @@ task: cpu: 1 memory: 2G timeout_in: 20m - env: - DOCKER_PACKAGES: "snapcraft" install_packages_script: - apt-get update - - apt-get install --no-install-recommends --no-upgrade -qq $DOCKER_PACKAGES + - apt-get install snapd snapcraft_pull_script: - - snap install multipass + - snap install snapcraft multipass - snapcraft pull ci_script: - snapcraft From 808cddbaaffc490343ca74c229e5b73eb65a2231 Mon Sep 17 00:00:00 2001 From: maflcko <6399679+maflcko@users.noreply.github.com> Date: Fri, 25 Oct 2024 11:54:12 +0200 Subject: [PATCH 08/13] Update .cirrus.yml --- .cirrus.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index be5a963..325178d 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -6,11 +6,8 @@ task: cpu: 1 memory: 2G timeout_in: 20m - install_packages_script: - - apt-get update - - apt-get install snapd snapcraft_pull_script: - - snap install snapcraft multipass + - snap install snapcraft multipass --classic - snapcraft pull ci_script: - snapcraft From 302fa6871f09a1ec6000d757069f5ad3dcbf7378 Mon Sep 17 00:00:00 2001 From: maflcko <6399679+maflcko@users.noreply.github.com> Date: Fri, 25 Oct 2024 11:57:13 +0200 Subject: [PATCH 09/13] Update .cirrus.yml --- .cirrus.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.cirrus.yml b/.cirrus.yml index 325178d..13c2a5e 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -7,7 +7,8 @@ task: memory: 2G timeout_in: 20m snapcraft_pull_script: - - snap install snapcraft multipass --classic + - snap install snapcraft --classic + - snap install multipass - snapcraft pull ci_script: - snapcraft From dffd69554726d5ac4d7a553b9b0d8e9cf85d6c1d Mon Sep 17 00:00:00 2001 From: maflcko <6399679+maflcko@users.noreply.github.com> Date: Fri, 25 Oct 2024 12:03:42 +0200 Subject: [PATCH 10/13] Update .cirrus.yml --- .cirrus.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.cirrus.yml b/.cirrus.yml index 13c2a5e..22ad39b 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -3,6 +3,7 @@ task: compute_engine_instance: # https://cirrus-ci.org/guide/custom-vms/#custom-compute-engine-vms image_project: ubuntu-os-cloud image: family/ubuntu-2404-lts-amd64 # https://cloud.google.com/compute/docs/images/os-details#ubuntu_lts + nested_virtualization: true cpu: 1 memory: 2G timeout_in: 20m From e63517952d34f56966d66e0a9811948186f08a2c Mon Sep 17 00:00:00 2001 From: maflcko <6399679+maflcko@users.noreply.github.com> Date: Fri, 25 Oct 2024 12:09:19 +0200 Subject: [PATCH 11/13] Update .cirrus.yml --- .cirrus.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 22ad39b..4a44b9f 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -4,8 +4,6 @@ task: image_project: ubuntu-os-cloud image: family/ubuntu-2404-lts-amd64 # https://cloud.google.com/compute/docs/images/os-details#ubuntu_lts nested_virtualization: true - cpu: 1 - memory: 2G timeout_in: 20m snapcraft_pull_script: - snap install snapcraft --classic From c89ba53fb43dbc9e95bdacd648361bee5aa9bf44 Mon Sep 17 00:00:00 2001 From: maflcko <6399679+maflcko@users.noreply.github.com> Date: Fri, 25 Oct 2024 12:10:46 +0200 Subject: [PATCH 12/13] Update .cirrus.yml --- .cirrus.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.cirrus.yml b/.cirrus.yml index 4a44b9f..44ec071 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -4,6 +4,7 @@ task: image_project: ubuntu-os-cloud image: family/ubuntu-2404-lts-amd64 # https://cloud.google.com/compute/docs/images/os-details#ubuntu_lts nested_virtualization: true + cpu: 4 # 1 is enough, but nested_virtualization machines have at least 4 timeout_in: 20m snapcraft_pull_script: - snap install snapcraft --classic From 3f7affffc7117d54057fb4d749300e3cbda974f3 Mon Sep 17 00:00:00 2001 From: maflcko <6399679+maflcko@users.noreply.github.com> Date: Fri, 25 Oct 2024 12:15:30 +0200 Subject: [PATCH 13/13] Update .cirrus.yml --- .cirrus.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.cirrus.yml b/.cirrus.yml index 44ec071..ebbc008 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -5,6 +5,7 @@ task: image: family/ubuntu-2404-lts-amd64 # https://cloud.google.com/compute/docs/images/os-details#ubuntu_lts nested_virtualization: true cpu: 4 # 1 is enough, but nested_virtualization machines have at least 4 + memory: 2G timeout_in: 20m snapcraft_pull_script: - snap install snapcraft --classic