diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1d2cd54..02305bd 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -44,10 +44,8 @@ jobs: fail-fast: false matrix: include: - - distro: debian10 - distro: debian11 - distro: debian12 - - distro: ubuntu1804 - distro: ubuntu2004 - distro: ubuntu2204 diff --git a/Vagrantfile b/Vagrantfile index 5daa6bf..aef9510 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -4,13 +4,6 @@ role = File.basename(File.expand_path(File.dirname(__FILE__))) boxes = [ - { - :name => "ubuntu-1804", - :box => "bento/ubuntu-18.04", - :ip => '10.0.0.13', - :cpu => "50", - :ram => "384" - }, { :name => "ubuntu-2004", :box => "bento/ubuntu-20.04", @@ -25,13 +18,6 @@ boxes = [ :cpu => "50", :ram => "512" }, - { - :name => "debian-10", - :box => "bento/debian-10", - :ip => '10.0.0.18', - :cpu => "50", - :ram => "256" - }, { :name => "debian-11", :box => "bento/debian-11", diff --git a/defaults/main.yml b/defaults/main.yml index dd58869..6021a18 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -1,5 +1,5 @@ # defaults file --- -rstudio_version: '2023.03.1-446' +rstudio_version: '2023.12.1-402' rstudio_download_url: "{{ rstudio_preset_download_url }}" rstudio_install: [] diff --git a/meta/main.yml b/meta/main.yml index 6878d75..6b87251 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -11,12 +11,10 @@ galaxy_info: platforms: - name: Ubuntu versions: - - bionic - focal - jammy - name: Debian versions: - - buster - bullseye - bookworm galaxy_tags: diff --git a/vars/_bullseye.yml b/vars/_bullseye.yml index a6f7b89..32a31c3 100644 --- a/vars/_bullseye.yml +++ b/vars/_bullseye.yml @@ -1,3 +1,3 @@ # vars file --- -rstudio_preset_download_url: "https://download1.rstudio.org/electron/bionic/{{ rstudio_machine_map[ansible_machine] }}/rstudio-{{ rstudio_version }}-{{ rstudio_machine_map[ansible_machine] }}.deb" +rstudio_preset_download_url: "https://download1.rstudio.org/electron/focal/{{ rstudio_machine_map[ansible_machine] }}/rstudio-{{ rstudio_version }}-{{ rstudio_machine_map[ansible_machine] }}.deb" diff --git a/vars/_buster.yml b/vars/_buster.yml deleted file mode 100644 index a6f7b89..0000000 --- a/vars/_buster.yml +++ /dev/null @@ -1,3 +0,0 @@ -# vars file ---- -rstudio_preset_download_url: "https://download1.rstudio.org/electron/bionic/{{ rstudio_machine_map[ansible_machine] }}/rstudio-{{ rstudio_version }}-{{ rstudio_machine_map[ansible_machine] }}.deb" diff --git a/vars/_focal.yml b/vars/_focal.yml deleted file mode 100644 index a6f7b89..0000000 --- a/vars/_focal.yml +++ /dev/null @@ -1,3 +0,0 @@ -# vars file ---- -rstudio_preset_download_url: "https://download1.rstudio.org/electron/bionic/{{ rstudio_machine_map[ansible_machine] }}/rstudio-{{ rstudio_version }}-{{ rstudio_machine_map[ansible_machine] }}.deb" diff --git a/vars/_stretch.yml b/vars/_stretch.yml deleted file mode 100644 index 371f126..0000000 --- a/vars/_stretch.yml +++ /dev/null @@ -1,3 +0,0 @@ -# vars file ---- -rstudio_preset_download_url: "https://download1.rstudio.org/electron/debian9/{{ ansible_machine }}/rstudio-{{ rstudio_version }}-{{ rstudio_machine_map[ansible_machine] }}.deb"