Update boxes to Ubuntu 24.04

roots · May 30, 2024 · fdf7bd1 · fdf7bd1
1 parent fb1812d
commit fdf7bd1
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 13 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -11,7 +11,7 @@ on:
 
 jobs:
   test:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     strategy:
       matrix:
         python-version: ['3.x']

diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
@@ -11,7 +11,7 @@ on:
 
 jobs:
   test:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - run: mkdir $HOME/.ssh
       - name: Remove and cleanup mysql

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+### HEAD
+* Update boxes to Ubuntu 24.04 [#1519](https://github.com/roots/trellis/pull/1519)
+
 ### 1.22.1: May 30th, 2024
 * Fix Nginx apt-key is deprecated failure [#1518](https://github.com/roots/trellis/pull/1518)
 

diff --git a/Vagrantfile b/Vagrantfile
@@ -19,14 +19,7 @@ trellis_config = Trellis::Config.new(root_path: ANSIBLE_PATH)
 Vagrant.require_version vconfig.fetch('vagrant_require_version', '>= 2.1.0')
 
 Vagrant.configure('2') do |config|
-  box = vconfig.fetch('vagrant_box')
-  box_auto_arch = vconfig.fetch('vagrant_box_auto_arch', true)
-
-  if box_auto_arch && !box.end_with?("-arm64") && apple_silicon?
-    box = "#{box}-arm64"
-  end
-
-  config.vm.box = box
+  config.vm.box = vconfig.fetch('vagrant_box')
   config.vm.box_version = vconfig.fetch('vagrant_box_version')
   config.ssh.forward_agent = true
   config.vm.post_up_message = post_up_message

diff --git a/vagrant.default.yml b/vagrant.default.yml
@@ -2,14 +2,13 @@
 vagrant_ip: '192.168.56.5'
 vagrant_cpus: 1
 vagrant_memory: 1024 # in MB
-vagrant_box: 'bento/ubuntu-22.04'
+vagrant_box: 'bento/ubuntu-24.04'
 vagrant_box_version: '>= 0'
-vagrant_box_auto_arch: true
 vagrant_ansible_version: '2.10.7'
 vagrant_skip_galaxy: false
 vagrant_mount_type: 'nfs'
 vagrant_nfs_udp: false
-vagrant_require_version: '>= 2.1.0'
+vagrant_require_version: '>= 2.4.0'
 
 vagrant_install_plugins: true
 vagrant_plugins: