Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

✨ Ubuntu 24.04 support #1519

Merged
merged 5 commits into from
Jul 30, 2024
Merged

✨ Ubuntu 24.04 support #1519

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
fdf7bd1
Update boxes to Ubuntu 24.04
retlehs May 30, 2024
ea26fba
Update CHANGELOG [ci skip]
retlehs May 30, 2024
fa42ecf
build
retlehs Jul 1, 2024
97baca0
🩹 Create /run/sshd directory to avoid error
retlehs Jul 24, 2024
86f8546
Update roles/sshd/tasks/main.yml
retlehs Jul 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ on:

jobs:
test:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
strategy:
matrix:
python-version: ['3.x']
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/integration.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
### HEAD
* Update boxes to Ubuntu 24.04 [#1519](https://github.com/roots/trellis/pull/1519)
* Update MariaDB to 10.11 [#1520](https://github.com/roots/trellis/pull/1520)

### 1.22.1: May 30th, 2024
* Fix Nginx apt-key is deprecated failure [#1518](https://github.com/roots/trellis/pull/1518)

Expand Down
9 changes: 1 addition & 8 deletions Vagrantfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 3 additions & 0 deletions roles/sshd/tasks/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@
label: "{{ item.key }}"
notify: restart ssh

- name: Create the /run/sshd directory
file: path=/run/sshd state=directory
retlehs marked this conversation as resolved.
Show resolved Hide resolved

- name: Create a secure sshd_config
template:
src: "{{ sshd_config }}"
Expand Down
5 changes: 2 additions & 3 deletions vagrant.default.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Loading