Skip to content

Commit 72b2bbe

Browse files
authored
Merge branch 'main' into agent-updates
2 parents 792fcca + 12731ed commit 72b2bbe

File tree

6 files changed

+7
-6
lines changed

6 files changed

+7
-6
lines changed

.github/workflows/ossf-scorecard.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
persist-credentials: false
3535

3636
- name: Run analysis
37-
uses: ossf/scorecard-action@dc50aa9510b46c811795eb24b2f1ba02a914e534 # v2.3.3
37+
uses: ossf/scorecard-action@62b2cac7ed8198b15735ed49ab1e5cf35480ba46 # v2.4.0
3838
with:
3939
results_file: results.sarif
4040
results_format: sarif
@@ -58,6 +58,6 @@ jobs:
5858

5959
# Upload the results to GitHub's code scanning dashboard.
6060
- name: Upload SARIF results to code scanning
61-
uses: github/codeql-action/upload-sarif@2d790406f505036ef40ecba973cc774a50395aac # v3.25.13
61+
uses: github/codeql-action/upload-sarif@afb54ba388a7dca6ecae48f608c4ff05ff4cc77a # v3.25.15
6262
with:
6363
sarif_file: results.sarif

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ BREAKING CHANGES:
66

77
- Remove support for RHEL 7 based distributions (RHEL/CentOS/Oracle Linux 7). CentOS 7 has reached EoL, RHEL 7 has reached EoM, and Oracle Linux 7 will reach EoL shortly. These distributions will not be supported by new NGINX releases moving forward. If you are still using one of these distributions, please consider upgrading. If you still want to use this role for the time being, please use the previous release (0.24.3). Do note that you will only be able to use NGINX versions released as of the date of the aforementioned release (July 11, 2024).
88
- Remove support for installing NGINX Open Source on Alpine Linux 3.16.
9+
- No longer omit `allow_downgrade` module parameter when running Ansible versions lower than `2.12`.
910

1011
FEATURES:
1112

tasks/opensource/install-debian.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,6 @@
2727
name: nginx{{ nginx_version | default('') }}
2828
state: "{{ nginx_state }}"
2929
update_cache: true
30-
allow_downgrade: "{{ omit if ansible_version['full'] is version('2.12', '<') else true }}"
30+
allow_downgrade: true
3131
ignore_errors: "{{ ansible_check_mode }}"
3232
notify: (Handler) Run NGINX

tasks/opensource/install-redhat.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,6 @@
2222
name: nginx{{ nginx_version | default('') }}
2323
state: "{{ nginx_state }}"
2424
update_cache: true
25-
allow_downgrade: "{{ omit if ansible_version['full'] is version('2.12', '<') else true }}"
25+
allow_downgrade: true
2626
ignore_errors: "{{ ansible_check_mode }}"
2727
notify: (Handler) Run NGINX

tasks/plus/install-debian.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
name: nginx-plus{{ nginx_version | default('') }}
2626
state: "{{ nginx_state }}"
2727
update_cache: true
28-
allow_downgrade: "{{ omit if ansible_version['full'] is version('2.12', '<') else true }}"
28+
allow_downgrade: true
2929
ignore_errors: "{{ ansible_check_mode }}"
3030
when: nginx_license_status is not defined
3131
notify: (Handler) Run NGINX

tasks/plus/install-redhat.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
name: nginx-plus{{ nginx_version | default('') }}
2323
state: "{{ nginx_state }}"
2424
update_cache: true
25-
allow_downgrade: "{{ omit if ansible_version['full'] is version('2.12', '<') else true }}"
25+
allow_downgrade: true
2626
ignore_errors: "{{ ansible_check_mode }}"
2727
when: nginx_license_status is not defined
2828
notify: (Handler) Run NGINX

0 commit comments

Comments
 (0)