Skip to content

Commit 7203f33

Browse files
Bump ansible-core from 2.11.3 to 2.12.1 (#14375)
* Bump ansible-core from 2.11.3 to 2.12.1 Bumps [ansible-core](https://github.com/ansible/ansible) from 2.11.3 to 2.12.1. - [Release notes](https://github.com/ansible/ansible/releases) - [Commits](ansible/ansible@v2.11.3...v2.12.1) --- updated-dependencies: - dependency-name: ansible-core dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> * Update requirements.txt * python and cache for actions * switch to python 3.8 * wait for lxc network * no point to support 18.04 in tests * cipher fix for openssl_privatekey * cipher fix for openssl_privatekey Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Jack Ivanov <[email protected]>
1 parent c759d75 commit 7203f33

File tree

8 files changed

+24
-113
lines changed

8 files changed

+24
-113
lines changed

.github/workflows/main.yml

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@ jobs:
99
- uses: actions/checkout@v2
1010
- uses: actions/[email protected]
1111
with:
12-
python-version: '3.7'
12+
python-version: '3.9'
13+
cache: 'pip'
1314

1415
- name: Install dependencies
1516
run: |
@@ -29,12 +30,13 @@ jobs:
2930
runs-on: ubuntu-20.04
3031
strategy:
3132
matrix:
32-
UBUNTU_VERSION: ["18.04", "20.04"]
33+
UBUNTU_VERSION: ["20.04"]
3334
steps:
3435
- uses: actions/checkout@v2
3536
- uses: actions/[email protected]
3637
with:
37-
python-version: '3.7'
38+
python-version: '3.9'
39+
cache: 'pip'
3840

3941
- name: Install dependencies
4042
run: |
@@ -88,12 +90,13 @@ jobs:
8890
runs-on: ubuntu-20.04
8991
strategy:
9092
matrix:
91-
UBUNTU_VERSION: ["18.04", "20.04"]
93+
UBUNTU_VERSION: ["20.04"]
9294
steps:
9395
- uses: actions/checkout@v2
9496
- uses: actions/[email protected]
9597
with:
96-
python-version: '3.7'
98+
python-version: '3.9'
99+
cache: 'pip'
97100

98101
- name: Install dependencies
99102
run: |

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ The easiest way to get an Algo server running is to run it on your local system
3737

3838
- Run the command `git clone https://github.com/trailofbits/algo.git` to create a directory named `algo` containing the Algo scripts.
3939

40-
3. **Install Algo's core dependencies.** Algo requires that **Python 3.6 or later** and at least one supporting package are installed on your system.
40+
3. **Install Algo's core dependencies.** Algo requires that **Python 3.8 or later** and at least one supporting package are installed on your system.
4141

4242
- **macOS:** Catalina (10.15) and higher includes Python 3 as part of the optional Command Line Developer Tools package. From Terminal run:
4343

docs/deploy-from-redhat-centos6.md

Lines changed: 0 additions & 97 deletions
This file was deleted.

docs/troubleshooting.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ Look here if you have a problem running the installer to set up a new Algo serve
4242

4343
### Python version is not supported
4444

45-
The minimum Python version required to run Algo is 3.6. Most modern operation systems should have it by default, but if the OS you are using doesn't meet the requirements, you have to upgrade. See the official documentation for your OS, or manual download it from https://www.python.org/downloads/. Otherwise, you may [deploy from docker](deploy-from-docker.md)
45+
The minimum Python version required to run Algo is 3.8. Most modern operation systems should have it by default, but if the OS you are using doesn't meet the requirements, you have to upgrade. See the official documentation for your OS, or manual download it from https://www.python.org/downloads/. Otherwise, you may [deploy from docker](deploy-from-docker.md)
4646

4747
### Error: "You have not agreed to the Xcode license agreements"
4848

main.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,10 @@
3131

3232
- name: Verify Python meets Algo VPN requirements
3333
assert:
34-
that: (ansible_python.version.major|string + '.' + ansible_python.version.minor|string) is version('3.6', '>=')
34+
that: (ansible_python.version.major|string + '.' + ansible_python.version.minor|string) is version('3.8', '>=')
3535
msg: >
3636
Python version is not supported.
37-
You must upgrade to at least Python 3.6 to use this version of Algo.
37+
You must upgrade to at least Python 3.8 to use this version of Algo.
3838
See for more details - https://trailofbits.github.io/algo/troubleshooting.html#python-version-is-not-supported
3939
4040
- name: Verify Ansible meets Algo VPN requirements

requirements.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ansible-core==2.11.3
2-
ansible==4.4.0
1+
ansible-core==2.12.1
2+
ansible==5.0.1
33
jinja2~=3.0.3
44
netaddr

roles/ssh_tunneling/tasks/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
openssl_privatekey:
6565
path: "{{ ssh_tunnels_config_path }}/{{ item.item }}.pem"
6666
passphrase: "{{ p12_export_password }}"
67-
cipher: aes256
67+
cipher: auto
6868
force: false
6969
no_log: "{{ no_log|bool }}"
7070
when: not item.stat.exists

tests/pre-deploy.sh

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,19 @@ lxc network attach lxdbr0 algo eth0 eth0
2525
lxc config device set algo eth0 ipv4.address 10.0.8.100
2626
lxc start algo
2727

28-
if [[ ${UBUNTU_VERSION} == "20.04" ]]; then
29-
lxc exec algo -- apt remove snapd --purge -y || true
30-
fi
31-
3228
ip addr
3329

3430
until dig A +short algo.lxd @10.0.8.1 | grep -vE '^$' > /dev/null; do
3531
sleep 3
3632
done
3733

34+
case ${UBUNTU_VERSION} in
35+
20.04)
36+
lxc exec algo -- apt remove snapd --purge -y || true
37+
;;
38+
18.04)
39+
lxc exec algo -- apt install python3.8 -y
40+
;;
41+
esac
42+
3843
lxc list

0 commit comments

Comments
 (0)