From 1d840e336ed3821dc313ae7fef06db6118248a4e Mon Sep 17 00:00:00 2001 From: Maximilian Kratz Date: Wed, 9 Nov 2022 15:03:24 +0100 Subject: [PATCH 1/4] Changes "IBeX" and all related URLs to "Neo" --- README.md | 14 +++++++------- prov.sh | 34 +++++++++++++++++----------------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/README.md b/README.md index a6ac9f3..a4d05d1 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,8 @@ -# eMoflon::IBeX VM +# eMoflon::Neo VM -[![Build eMoflon::IBeX VM](https://github.com/eMoflon/emoflon-ibex-vm/actions/workflows/vagrant-up.yml/badge.svg?branch=main&event=push)](https://github.com/eMoflon/emoflon-ibex-vm/actions/workflows/vagrant-up.yml) +[![Build eMoflon::Neo VM](https://github.com/maxkratz/emoflon-neo-vm/actions/workflows/vagrant-up.yml/badge.svg?branch=main&event=push)](https://github.com/maxkratz/emoflon-neo-vm/actions/workflows/vagrant-up.yml) -This repository is used to automatically build an [eMoflon](https://emoflon.org) virtual machine (VM). +This repository is used to automatically build an [eMoflon::Neo](https://emoflon.org/neo/) virtual machine (VM). ## Packages/Configuration @@ -10,12 +10,12 @@ This repository is used to automatically build an [eMoflon](https://emoflon.org) - [Ubuntu 20.04](https://app.vagrantup.com/gusztavvargadr/boxes/ubuntu-desktop) - [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*) +- [eMoflon Neo Eclipse build](https://github.com/maxkratz/emoflon-neo-eclipse-build) (variant: *eclipse-emoflon-linux-user*) ## Usage/Installation -- Download the latest version from the [release page](https://github.com/eMoflon/emoflon-ibex-vm/releases/latest). +- Download the latest version from the [release page](https://github.com/maxkratz/emoflon-neo-vm/releases/latest). - Install [VirtualBox](https://www.virtualbox.org/) (or another Hypervisor compatible to `OVA` files). - Import the `OVA` file as new VM in VirtualBox. (More detailed description can be found [here](https://docs.oracle.com/cd/E26217_01/E26796/html/qs-import-vm.html).) - Use the credentials `vagrant:vagrant` to login. @@ -23,7 +23,7 @@ This repository is used to automatically build an [eMoflon](https://emoflon.org) **Please notice:** - The default configuration for this VM image consists 8GB of RAM and 2 vCPU cores. -You need at least 8GB to run the full [eMoflon::IBeX test suite](https://github.com/eMoflon/emoflon-ibex-tests). If your PC only has 8GB of RAM available, reduce the RAM capacity of the VM within VirtualBox +You need at least 8GB to run the full [eMoflon::Neo test suite](https://github.com/eMoflon/emoflon-neo/blob/master/projectSetRuntime.psf). If your PC only has 8GB of RAM available, reduce the RAM capacity of the VM within VirtualBox - It is recommend to change the settings to at least 4 vCPU cores. @@ -35,7 +35,7 @@ There are two ways to provide this project with runners. Unfortunately, only the macOS-based GitHub-hosted action runners do support nested virtualization: https://github.com/actions/runner-images/issues/433 -Therefore, we've adapted the CI-configuration to provision the **eMoflon-IBeX-VM** on a macOS-based runner until nested virtualization support gets added to the Linux-based runners. +Therefore, we've adapted the CI-configuration to provision the **eMoflon-Neo-VM** on a macOS-based runner until nested virtualization support gets added to the Linux-based runners. ### Self-hosted Linux-based runners diff --git a/prov.sh b/prov.sh index eba3a41..1d179e6 100644 --- a/prov.sh +++ b/prov.sh @@ -46,7 +46,7 @@ cd ~/eclipse-apps # Get eclipse if [[ ! -f "./$ECLIPSE_ARCHIVE.zip" ]]; then log "Downloading latest eMoflon Eclipse archive from Github." - curl -s https://api.github.com/repos/eMoflon/emoflon-ibex-eclipse-build/releases/latest \ + curl -s https://api.github.com/repos/maxkratz/emoflon-neo-eclipse-build/releases/latest \ | grep "$ECLIPSE_ARCHIVE.zip" \ | cut -d : -f 2,3 \ | tr -d \" \ @@ -68,9 +68,9 @@ touch /home/vagrant/Desktop/emoflon-app.desktop printf " [Desktop Entry] Version=1.0 -Name=eMoflon::IBeX Eclipse -Comment=Use eMoflon::IBeX Eclipse -GenericName=eMoflon::IBeX Eclipse +Name=eMoflon::Neo Eclipse +Comment=Use eMoflon::Neo Eclipse +GenericName=eMoflon::Neo Eclipse Exec=bash -c \"cd /home/vagrant/eclipse-apps/eclipse && ./eclipse\" Terminal=false X-MultipleArgs=false @@ -83,29 +83,29 @@ touch /home/vagrant/Desktop/emoflon-website.desktop printf " [Desktop Entry] Encoding=UTF-8 -Name=eMoflon::IBeX Website +Name=eMoflon::Neo Website Type=Link -URL=https://emoflon.org/ibex +URL=https://emoflon.org/neo Icon=web-browser " > /home/vagrant/Desktop/emoflon-website.desktop -touch /home/vagrant/Desktop/emoflon-tutorial.desktop -printf " -[Desktop Entry] -Encoding=UTF-8 -Name=eMoflon::IBeX Tutorial -Type=Link -URL=https://github.com/eMoflon/emoflon-ibex-tutorial/releases/latest -Icon=web-browser -" > /home/vagrant/Desktop/emoflon-tutorial.desktop +#touch /home/vagrant/Desktop/emoflon-tutorial.desktop +#printf " +#[Desktop Entry] +#Encoding=UTF-8 +#Name=eMoflon::IBeX Tutorial +#Type=Link +#URL=https://github.com/eMoflon/emoflon-ibex-tutorial/releases/latest +#Icon=web-browser +#" > /home/vagrant/Desktop/emoflon-tutorial.desktop touch /home/vagrant/Desktop/emoflon-tests.desktop printf " [Desktop Entry] Encoding=UTF-8 -Name=eMoflon::IBeX Test Suite +Name=eMoflon::Neo Test Suite Type=Link -URL=https://github.com/eMoflon/emoflon-ibex-tests +URL=https://github.com/eMoflon/emoflon-neo/blob/master/projectSetRuntime.psf Icon=web-browser " > /home/vagrant/Desktop/emoflon-tests.desktop From f8c066c202ca25c3ff356aabf726f86a0ca227c9 Mon Sep 17 00:00:00 2001 From: Maximilian Kratz Date: Wed, 9 Nov 2022 16:17:52 +0100 Subject: [PATCH 2/4] Install Neo4j in provisioning script Adds entry to README.md --- README.md | 1 + prov.sh | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/README.md b/README.md index a4d05d1..0f4e1af 100644 --- a/README.md +++ b/README.md @@ -11,6 +11,7 @@ This repository is used to automatically build an [eMoflon::Neo](https://emoflon - [OpenJDK 17](https://openjdk.org/projects/jdk/17/) - [Graphviz](https://graphviz.org/) - [eMoflon Neo Eclipse build](https://github.com/maxkratz/emoflon-neo-eclipse-build) (variant: *eclipse-emoflon-linux-user*) +- [Neo4j](https://neo4j.com/) ## Usage/Installation diff --git a/prov.sh b/prov.sh index 1d179e6..11c074a 100644 --- a/prov.sh +++ b/prov.sh @@ -111,6 +111,14 @@ Icon=web-browser chmod u+x /home/vagrant/Desktop/*.desktop +# Neo4j installation +# https://debian.neo4j.com/ +log "Install Neo4j." +wget -O - https://debian.neo4j.com/neotechnology.gpg.key | sudo apt-key add - +echo 'deb https://debian.neo4j.com stable latest' | sudo tee /etc/apt/sources.list.d/neo4j.list +sudo apt-get update +sudo apt-get install -y neo4j + log "Clean-up" sudo apt-get remove -yq \ snapd \ From bc47c378e6f5d86935b0be137f7b83bc982c8428 Mon Sep 17 00:00:00 2001 From: Maximilian Kratz Date: Thu, 10 Nov 2022 08:38:33 +0100 Subject: [PATCH 3/4] Adds desktop entry for the Neo4j browser + enables neo4j service --- prov.sh | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/prov.sh b/prov.sh index 11c074a..45ca642 100644 --- a/prov.sh +++ b/prov.sh @@ -109,6 +109,16 @@ URL=https://github.com/eMoflon/emoflon-neo/blob/master/projectSetRuntime.psf Icon=web-browser " > /home/vagrant/Desktop/emoflon-tests.desktop +touch /home/vagrant/Desktop/neo4j.desktop +printf " +[Desktop Entry] +Encoding=UTF-8 +Name=Neo4j Browser +Type=Link +URL=localhost:7474 +Icon=web-browser +" > /home/vagrant/Desktop/neo4j.desktop + chmod u+x /home/vagrant/Desktop/*.desktop # Neo4j installation @@ -118,6 +128,7 @@ wget -O - https://debian.neo4j.com/neotechnology.gpg.key | sudo apt-key add - echo 'deb https://debian.neo4j.com stable latest' | sudo tee /etc/apt/sources.list.d/neo4j.list sudo apt-get update sudo apt-get install -y neo4j +sudo systemctl enable neo4j log "Clean-up" sudo apt-get remove -yq \ From 54bcefa6a18c4dee72cb9fd5926bf59334393e75 Mon Sep 17 00:00:00 2001 From: Maximilian Kratz Date: Thu, 10 Nov 2022 09:46:33 +0100 Subject: [PATCH 4/4] Fixed Neo4j browser URL in desktop file --- prov.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/prov.sh b/prov.sh index 45ca642..c370980 100644 --- a/prov.sh +++ b/prov.sh @@ -115,7 +115,7 @@ printf " Encoding=UTF-8 Name=Neo4j Browser Type=Link -URL=localhost:7474 +URL=http://localhost:7474 Icon=web-browser " > /home/vagrant/Desktop/neo4j.desktop