From 99f975f3d0f2864b15c890510e16b8b241e907e0 Mon Sep 17 00:00:00 2001 From: Maximilian Kratz Date: Sun, 12 May 2024 13:06:36 +0200 Subject: [PATCH 1/5] Updates base (X)Ubuntu image to 24.04 (Trigger new CI build) --- README.md | 2 +- Vagrantfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 1925903..08aec9b 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ This repository is used to automatically build an [EdgeDB](https://www.edgedb.co ## Packages/Configuration -- [Ubuntu 22.04](https://app.vagrantup.com/gusztavvargadr/boxes/xubuntu-desktop-2204-lts) +- [Ubuntu 24.04](https://app.vagrantup.com/gusztavvargadr/boxes/xubuntu-desktop-2404-lts) - [EdgeDB](https://www.edgedb.com/) diff --git a/Vagrantfile b/Vagrantfile index 4a8d9ab..03476fd 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -1,7 +1,7 @@ token = ENV["GITHUB_TOKEN"] Vagrant.configure("2") do |config| - config.vm.box = "gusztavvargadr/xubuntu-desktop-2204-lts" + config.vm.box = "gusztavvargadr/xubuntu-desktop-2404-lts" config.vm.define 'edgedb' config.vm.provider :virtualbox do |vb| vb.name = "edgedb" From d24090fa434d4b8b6ac67c208c93d924a48acd85 Mon Sep 17 00:00:00 2001 From: Max Kratz Date: Sat, 18 May 2024 11:41:35 +0200 Subject: [PATCH 2/5] Adaptions after merging main --- .github/workflows/vagrant-up.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/vagrant-up.yml b/.github/workflows/vagrant-up.yml index eb1d367..c44204a 100644 --- a/.github/workflows/vagrant-up.yml +++ b/.github/workflows/vagrant-up.yml @@ -35,7 +35,7 @@ jobs: - name: clean up old Vagrant artifacts run: | vagrant destroy edgedb || true - vagrant box remove gusztavvargadr/xubuntu-desktop-2204-lts || true + vagrant box remove gusztavvargadr/xubuntu-desktop-2404-lts || true # https://stackoverflow.com/a/71346341 - name: clean up old GitHub Actions runner build folder run: | From 2c79a2137d331fda9bd1291911b21341f2515018 Mon Sep 17 00:00:00 2001 From: Max Kratz Date: Mon, 20 May 2024 21:33:30 +0200 Subject: [PATCH 3/5] Hard-coding Ubuntu jammy in EdgeDB installation https://github.com/edgedb/edgedb/issues/7364#issuecomment-2120913558 --- prov.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/prov.sh b/prov.sh index d953249..91de738 100644 --- a/prov.sh +++ b/prov.sh @@ -41,10 +41,10 @@ sudo mkdir -p /usr/local/share/keyrings && \ echo deb [signed-by=/usr/local/share/keyrings/edgedb-keyring.gpg] \ https://packages.edgedb.com/apt \ - $(grep "VERSION_CODENAME=" /etc/os-release | cut -d= -f2) main \ + jammy main \ | sudo tee /etc/apt/sources.list.d/edgedb.list -sudo apt-get update && sudo apt-get install -y edgedb-3 +sudo apt-get update && sudo apt-get install -y edgedb-3 libicu70 sudo systemctl enable --now edgedb-server-3 From 52a05dae9ed8d117282e58af789b5e4e284a162b Mon Sep 17 00:00:00 2001 From: Maximilian Kratz Date: Tue, 21 May 2024 06:57:27 +0200 Subject: [PATCH 4/5] Workaround: install libicu70 manually Download the package from the jammy repo --- prov.sh | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/prov.sh b/prov.sh index 91de738..3eff830 100644 --- a/prov.sh +++ b/prov.sh @@ -39,12 +39,19 @@ sudo mkdir -p /usr/local/share/keyrings && \ -o /usr/local/share/keyrings/edgedb-keyring.gpg \ https://packages.edgedb.com/keys/edgedb-keyring.gpg +# Currently, `jammy` as workaround because the EdgeDB apt repo does not +# contain a release for `noble` echo deb [signed-by=/usr/local/share/keyrings/edgedb-keyring.gpg] \ https://packages.edgedb.com/apt \ jammy main \ | sudo tee /etc/apt/sources.list.d/edgedb.list -sudo apt-get update && sudo apt-get install -y edgedb-3 libicu70 +# Workaround for `noble`: Install libicu70 manually +sudo wget http://de.archive.ubuntu.com/ubuntu/pool/main/i/icu/libicu70_70.1-2_amd64.deb +sudo apt-get install -y ./libicu70_70.1-2_amd64.deb +sudo rm ./libicu70_70.1-2_amd64.deb + +sudo apt-get update && sudo apt-get install -y edgedb-3 sudo systemctl enable --now edgedb-server-3 From 85036095ad32d40fd4a90dea79b631bb54658440 Mon Sep 17 00:00:00 2001 From: Maximilian Kratz Date: Tue, 21 May 2024 09:46:54 +0200 Subject: [PATCH 5/5] Fixes permissions of the desktop file (link) --- prov.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/prov.sh b/prov.sh index 3eff830..136b7e5 100644 --- a/prov.sh +++ b/prov.sh @@ -69,6 +69,9 @@ Icon=web-browser chmod u+x /home/vagrant/Desktop/*.desktop +sudo mv /home/vagrant/Desktop/*.desktop /usr/share/xubuntu/applications/ +sudo ln -s /usr/share/xubuntu/applications/edgedb-admin-ui.desktop /home/vagrant/Desktop/edgedb-admin-ui.desktop + # Enable the admin UI sudo cp /lib/systemd/system/edgedb-server-3.service /etc/systemd/system/edgedb-server-3.service sudo sed -i '/Environment=EDGEDATA=\/var\/lib\/edgedb\/3\/data\//a Environment=EDGEDB_SERVER_ADMIN_UI=enabled' /etc/systemd/system/edgedb-server-3.service