Skip to content

Commit

Permalink
Merge pull request #97 from jburel/debian10
Browse files Browse the repository at this point in the history
remove debian 10
  • Loading branch information
jburel committed Jul 10, 2024
2 parents 0259b15 + a152a36 commit c6782aa
Show file tree
Hide file tree
Showing 15 changed files with 7 additions and 291 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
os: [ubuntu2004, ubuntu2204, debian10, rockylinux9]
os: [ubuntu2004, ubuntu2204, rockylinux9]
websession: [true, false]
webprefix: ["", "/omero"]
steps:
Expand Down
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ ansible/.DS_Store
**/omeroweb-install-*
**/ubuntu2004-*/**
**/ubuntu2204-*/**
**/debian10-*/**
**/osx*/**
**/rockylinux9-*/**
**/doc/**
10 changes: 0 additions & 10 deletions .travis/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,6 @@ if [[ ${TRAVIS_OS_NAME:-} == 'linux' ]]; then
else
echo "Testing in local system!"
case "${OS}" in
debian10)
if ${ANSIBLE:-false} ; then
./test/docker-build-ansible.sh
else
current_dir=${PWD##*/}
mv `pwd` /tmp/
chmod 755 -R /tmp/$current_dir
sudo /tmp/$current_dir/omeroweb-install-debian10-ice${ICEVER}
fi
;;
ubuntu2004)
if ${ANSIBLE:-false} ; then
./test/docker-build-ansible.sh
Expand Down
51 changes: 0 additions & 51 deletions ansible/group_vars/debian10-ice3.6

This file was deleted.

5 changes: 0 additions & 5 deletions ansible/hosts/debian10-ice3.6

This file was deleted.

8 changes: 4 additions & 4 deletions ansible/omeroweb-install.yml
Original file line number Diff line number Diff line change
Expand Up @@ -118,18 +118,18 @@
src: "{{ os }}/omero-web-systemd.service.j2"
dest: "{{ path }}/{{ prefix }}/omero-web-systemd.service"
when: (os | regex_findall("rocky"))
- name: Generate omero-web-init.d (ubuntu/debian)
- name: Generate omero-web-init.d (ubuntu)
template:
src: "{{ os }}/omero-web-init.d.j2"
dest: "{{ path }}/{{ prefix }}/omero-web-init.d"
when: (os | regex_findall("ubuntu")) or (os | regex_findall("debian"))
when: (os | regex_findall("ubuntu"))

- name: Generate run.sh (ubuntu/debian/osx)
- name: Generate run.sh (ubuntu/osx)
template:
src: "{{ os }}/run.sh.j2"
dest: "{{ path }}/{{ prefix }}/run"
mode: a+x
when: (os | regex_findall("ubuntu")) or os=="osx" or (os | regex_findall("debian"))
when: (os | regex_findall("ubuntu")) or os=="osx"

- name: Generate init.sh (osx)
template:
Expand Down
23 changes: 0 additions & 23 deletions ansible/templates/debian10/daemon.sh.j2

This file was deleted.

19 changes: 0 additions & 19 deletions ansible/templates/debian10/deps.sh.j2

This file was deleted.

11 changes: 0 additions & 11 deletions ansible/templates/debian10/deps_ice3.6.sh.j2

This file was deleted.

17 changes: 0 additions & 17 deletions ansible/templates/debian10/deps_web_session.sh.j2

This file was deleted.

19 changes: 0 additions & 19 deletions ansible/templates/debian10/nginx.sh.j2

This file was deleted.

75 changes: 0 additions & 75 deletions ansible/templates/debian10/omero-web-init.d.j2

This file was deleted.

21 changes: 0 additions & 21 deletions ansible/templates/debian10/run.sh.j2

This file was deleted.

4 changes: 2 additions & 2 deletions ansible/templates/omeroweb-install-doc.txt.j2
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@
{{ style()|indent }}
{% endif %}

{% if os.startswith('ubuntu') or os.startswith('debian') %}
{% if os.startswith('ubuntu') %}
{% set path = os + '/omero-web-init.d.j2'%}
{% macro style() %}{% include path ignore missing with context %}{% endmacro %}
{{ style()|indent }}
Expand All @@ -174,7 +174,7 @@
{{ style()|indent }}
{% endif %}

{% if os.startswith('ubuntu') or os == 'osx' or os.startswith('debian') %}
{% if os.startswith('ubuntu') or os == 'osx' %}
{% set path = os + '/run.sh.j2'%}
{% macro style() %}{% include path ignore missing with context %}{% endmacro %}
{{ style()|indent }}
Expand Down
32 changes: 0 additions & 32 deletions test/Dockerfile_debian10

This file was deleted.

0 comments on commit c6782aa

Please sign in to comment.