Skip to content

Commit d1e147e

Browse files
authored
Merge pull request #556 from ANXS/development
Revival commit - PG 14 & 15 on ub22.04, deb11, rocky8
2 parents 495eb6b + 472fb6f commit d1e147e

33 files changed

+212
-188
lines changed

.github/workflows/ci.yml

Lines changed: 21 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -17,41 +17,35 @@ defaults:
1717

1818
jobs:
1919

20-
# lint:
21-
# name: Lint
22-
# runs-on: ubuntu-latest
23-
# steps:
24-
# - name: Check out the codebase.
25-
# uses: actions/checkout@v2
26-
# with:
27-
# path: 'postgresql'
28-
#
29-
# - name: Set up Python 3.
30-
# uses: actions/setup-python@v2
31-
# with:
32-
# python-version: '3.x'
33-
#
34-
# - name: Install test dependencies.
35-
# run: pip3 install yamllint
36-
#
37-
# - name: Lint code.
38-
# run: |
39-
# yamllint .
20+
lint:
21+
name: Yamllint
22+
runs-on: ubuntu-latest
23+
steps:
24+
- name: Check out the codebase.
25+
uses: actions/checkout@v4
26+
with:
27+
path: 'postgresql'
28+
29+
- name: Set up Python 3.
30+
uses: actions/setup-python@v5
31+
with:
32+
python-version: '3.x'
33+
34+
- name: Install test dependencies.
35+
run: pip3 install yamllint
36+
37+
- name: Lint code.
38+
run: |
39+
yamllint .
4040
4141
molecule:
4242
name: Molecule
4343
runs-on: ubuntu-latest
4444
strategy:
4545
matrix:
4646
include:
47-
- distro: centos8
48-
- distro: debian9
49-
- distro: debian10
47+
- distro: rockylinux8
5048
- distro: debian11
51-
- distro: fedora37
52-
- distro: ubuntu1604
53-
- distro: ubuntu1804
54-
- distro: ubuntu2004
5549
- distro: ubuntu2204
5650

5751
steps:

.yamllint

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
---
2+
3+
yaml-files:
4+
- '*.yaml'
5+
- '*.yml'
6+
- '.yamllint'
7+
8+
rules:
9+
braces: disable
10+
brackets: disable
11+
colons: disable
12+
commas: disable
13+
comments: disable
14+
comments-indentation: disable
15+
document-end: disable
16+
document-start: disable
17+
empty-lines:
18+
max: 1
19+
max-start: 1
20+
max-end: 1
21+
empty-values:
22+
forbid-in-block-mappings: true
23+
forbid-in-flow-mappings: true
24+
hyphens:
25+
max-spaces-after: 1
26+
indentation: disable
27+
key-duplicates: disable
28+
key-ordering: disable
29+
line-length: disable
30+
new-line-at-end-of-file: enable
31+
new-lines: disable
32+
octal-values: disable
33+
quoted-strings: disable
34+
trailing-spaces: enable
35+
truthy: disable

README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ An example how to include this role as a task:
6565
| Ubuntu 18.04.x | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: |:grey_question: | :grey_question: |
6666
| Ubuntu 20.04.x | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: |:grey_question: | :grey_question: |
6767
| Ubuntu 22.04.x | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: |:grey_question: | :white_check_mark: |
68+
| Rockylinux 9.x | :grey_question: | :grey_question: | :grey_question: | :grey_question: |:white_check_mark: | :white_check_mark: |
6869
| Fedora 37 | :grey_question: | :grey_question: | :grey_question: | :grey_question: |:grey_question: | :grey_question: |
6970

7071
- :white_check_mark: - tested, works fine
@@ -179,6 +180,7 @@ Maintainers:
179180
- [Greg Clough](https://github.com/gclough)
180181
- [Magnus Lübeck](https://github.com/maglub)
181182
- [Leo C.](https://github.com/MrMegaNova)
183+
- [Laurent Lavaud](https://github.com/fidelio33b)
182184

183185
Top Contributors:
184186
- [David Farrington](https://github.com/farridav)

Vagrantfile

Lines changed: 4 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -7,46 +7,11 @@ Vagrant.configure('2') do |config|
77
config.ssh.insert_key = false
88
config.ssh.private_key_path = '~/.vagrant.d/insecure_private_key'
99

10-
#
11-
# DISABLED
12-
#
13-
# config.vm.define 'ubuntu16.local' do |machine|
14-
#
15-
# machine.vm.box = "bento/ubuntu-16.04"
16-
# machine.vm.network :private_network, ip: '192.168.88.10'
17-
# machine.vm.hostname = 'ubuntu16.local'
18-
#
19-
# machine.vm.provision 'ansible' do |ansible|
20-
# ansible.playbook = 'tests/playbook.yml'
21-
# ansible.verbose = "vvv"
22-
# ansible.become = true
23-
# ansible.inventory_path = 'vagrant-inventory'
24-
# ansible.host_key_checking = false
25-
# end
26-
#
27-
# end
10+
config.vm.define 'jammy64.local' do |machine|
2811

29-
config.vm.define 'jessie64.local' do |machine|
30-
31-
machine.vm.box = "debian/jessie64"
32-
machine.vm.network :private_network, ip: '192.168.88.20'
33-
machine.vm.hostname = 'jessie64.local'
34-
35-
machine.vm.provision 'ansible' do |ansible|
36-
ansible.playbook = 'tests/playbook.yml'
37-
ansible.verbose = "vvv"
38-
ansible.become = true
39-
ansible.inventory_path = 'vagrant-inventory'
40-
ansible.host_key_checking = false
41-
end
42-
43-
end
44-
45-
config.vm.define 'wheezy64.local' do |machine|
46-
47-
machine.vm.box = "debian/wheezy64"
48-
machine.vm.network :private_network, ip: '192.168.88.21'
49-
machine.vm.hostname = 'wheezy64.local'
12+
machine.vm.box = "ubuntu/jammy64"
13+
machine.vm.network :private_network, ip: '192.168.88.22'
14+
machine.vm.hostname = 'jammy64.local'
5015

5116
machine.vm.provision 'ansible' do |ansible|
5217
ansible.playbook = 'tests/playbook.yml'
@@ -58,39 +23,4 @@ Vagrant.configure('2') do |config|
5823

5924
end
6025

61-
config.vm.define 'centos7.local' do |machine|
62-
63-
machine.vm.box = "centos/7"
64-
machine.vm.network :private_network, ip: '192.168.88.30'
65-
machine.vm.hostname = 'centos7.local'
66-
67-
machine.vm.provision 'ansible' do |ansible|
68-
ansible.playbook = 'tests/playbook.yml'
69-
ansible.verbose = "vvv"
70-
ansible.become = true
71-
ansible.inventory_path = 'vagrant-inventory'
72-
ansible.host_key_checking = false
73-
end
74-
75-
end
76-
77-
##
78-
## Fedora is disabled, as the build fails
79-
##
80-
## config.vm.define 'fedora27.local' do |machine|
81-
##
82-
## machine.vm.box = "fedora/27-cloud-base"
83-
## machine.vm.network :private_network, ip: '192.168.88.40'
84-
## machine.vm.hostname = 'fedora27.local'
85-
##
86-
## machine.vm.provision 'ansible' do |ansible|
87-
## ansible.playbook = 'tests/playbook.yml'
88-
## ansible.verbose = "vvv"
89-
## ansible.become = true
90-
## ansible.inventory_path = 'vagrant-inventory'
91-
## ansible.host_key_checking = false
92-
## end
93-
##
94-
## end
95-
9626
end

0 commit comments

Comments
 (0)