Skip to content

Commit 47f57e8

Browse files
authored
Fix CI/CD pipeline (#324)
1 parent f5611fa commit 47f57e8

File tree

9 files changed

+241
-203
lines changed

9 files changed

+241
-203
lines changed

.github/release-drafter.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
---
22
name-template: "$RESOLVED_VERSION"
33
tag-template: "$RESOLVED_VERSION"
4+
include-pre-releases: true
45
categories:
56
- title: "💣 Breaking Changes"
67
labels:

.github/workflows/molecule.yml

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,27 @@ on:
1313
- cron: "0 0 1 * *"
1414
workflow_dispatch:
1515
jobs:
16+
ansible-lint:
17+
name: Ansible Lint
18+
runs-on: ubuntu-22.04
19+
steps:
20+
- name: Check out the codebase
21+
uses: actions/checkout@v3
22+
23+
- name: Set up Python 3
24+
uses: actions/setup-python@v4
25+
with:
26+
python-version: 3.x
27+
28+
- name: Install Ansible Lint
29+
run: pip3 install -r .github/workflows/requirements/requirements_ansible_lint.txt
30+
31+
- name: Install Ansible collection dependencies
32+
run: ansible-galaxy install -r .github/workflows/requirements/requirements_ansible.yml
33+
34+
- name: Run Ansible Lint
35+
run: ansible-lint --force-color
36+
1637
molecule:
1738
name: Molecule
1839
runs-on: ubuntu-22.04
@@ -27,6 +48,7 @@ jobs:
2748
- default
2849
- plus
2950
- stable_push
51+
needs: ansible-lint
3052
steps:
3153
- name: Check out the codebase
3254
if: ${{ !(contains(matrix.scenario, 'plus')) || (env.NGINX_CRT != 0 && env.NGINX_KEY != 0) }}
@@ -42,7 +64,7 @@ jobs:
4264
if: ${{ !(contains(matrix.scenario, 'plus')) || (env.NGINX_CRT != 0 && env.NGINX_KEY != 0) }}
4365
run: pip3 install -r .github/workflows/requirements/requirements_molecule.txt
4466

45-
- name: Install Ansible core dependencies
67+
- name: Install Ansible core collection dependencies
4668
if: ${{ !(contains(matrix.scenario, 'plus')) || (env.NGINX_CRT != 0 && env.NGINX_KEY != 0) }}
4769
run: ansible-galaxy install -r .github/workflows/requirements/requirements_ansible.yml
4870

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
---
22
collections:
33
- name: ansible.posix
4-
version: 1.4.0
4+
version: 1.5.2
55
- name: community.general
6-
version: 6.2.0
7-
- name: community.crypto # Only required to test the NGINX Plus Molecule scenario
8-
version: 2.10.0
6+
version: 7.0.1
7+
- name: community.crypto # Only required if you plan to to test the NGINX Plus Molecule scenario
8+
version: 2.13.1
99
- name: community.docker # Only required if you plan to use Molecule
10-
version: 3.4.0
10+
version: 3.4.6
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
ansible-core==2.15.0
2+
ansible-compat==3.0.2
3+
yamllint==1.32.0
4+
ansible-lint==6.16.2
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
ansible-core==2.14.4
1+
ansible-core==2.15.0
Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
ansible-core==2.14.4
2-
Jinja2==3.1.2
3-
ansible-lint==6.15.0
4-
yamllint==1.31.0
5-
molecule[docker]==4.0.4
6-
docker==6.0.1
1+
ansible-core==2.15.0
2+
jinja2==3.1.2
3+
ansible-compat==3.0.2
4+
molecule==5.0.1
5+
molecule-plugins[docker]==23.4.1
6+
docker==6.1.3

CHANGELOG.md

Lines changed: 196 additions & 185 deletions
Large diffs are not rendered by default.

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ This role configures NGINX Open Source and NGINX Plus on your target host.
2121
---
2222
collections:
2323
- name: ansible.posix
24-
version: 1.4.0
24+
version: 1.5.2
2525
- name: community.general
26-
version: 6.2.0
26+
version: 7.0.1
2727
- name: community.docker # Only required if you plan to use Molecule (see below)
28-
version: 3.4.0
28+
version: 3.4.6
2929
```
3030
3131
**Note:** You can alternatively install the Ansible community distribution (what is known as the "old" Ansible) if you don't want to manage individual collections.

meta/main.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ galaxy_info:
1212
platforms:
1313
- name: Alpine
1414
versions: [all]
15-
- name: Amazon Linux 2
16-
versions: [all]
15+
- name: Amazon Linux
16+
versions: ['2', '2023']
1717
- name: Debian
1818
versions: [bullseye]
1919
- name: EL

0 commit comments

Comments
 (0)