Skip to content

Commit

Permalink
Merge pull request #45 from eMoflon/feature/ubuntu-24.04-upgrade
Browse files Browse the repository at this point in the history
Updates the base (X)Ubuntu image to 24.04
  • Loading branch information
maxkratz authored May 15, 2024
2 parents 75907ac + 67efa6c commit e661590
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/vagrant-up.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
- name: clean up old Vagrant artifacts
run: |
vagrant destroy emoflon || 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: |
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ This repository is used to automatically build an [eMoflon](https://emoflon.org)

## 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)
- [OpenJDK 17](https://openjdk.org/projects/jdk/17/)
- [Graphviz](https://graphviz.org/)
- [eMoflon IBeX Eclipse build](https://github.com/eMoflon/emoflon-ibex-eclipse-build) (variant: *eclipse-emoflon-linux-user*)
Expand Down
2 changes: 1 addition & 1 deletion Vagrantfile
Original file line number Diff line number Diff line change
@@ -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 'emoflon'
config.vm.provider :virtualbox do |vb|
vb.name = "emoflon"
Expand Down
7 changes: 7 additions & 0 deletions prov.sh
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,13 @@ 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/emoflon-app.desktop /home/vagrant/Desktop/emoflon-app.desktop
sudo ln -s /usr/share/xubuntu/applications/emoflon-website.desktop /home/vagrant/Desktop/emoflon-website.desktop
sudo ln -s /usr/share/xubuntu/applications/emoflon-tutorial.desktop /home/vagrant/Desktop/emoflon-tutorial.desktop
sudo ln -s /usr/share/xubuntu/applications/emoflon-tests.desktop /home/vagrant/Desktop/emoflon-tests.desktop

# Clean up
log "Clean-up"
sudo apt-get remove -yq \
libreoffice-* \
Expand Down

0 comments on commit e661590

Please sign in to comment.