From cde5a4fe4317423e1334d8e01ea1850e9d18baa0 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Bellet Date: Tue, 8 Nov 2022 09:32:00 +0100 Subject: [PATCH 1/6] Upgrade yarn to the latest stable version --- inventory/group_vars/all.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/inventory/group_vars/all.yml b/inventory/group_vars/all.yml index 856828f62..e2c7ae489 100644 --- a/inventory/group_vars/all.yml +++ b/inventory/group_vars/all.yml @@ -147,7 +147,7 @@ debezium_version: "0.10.0.Final" npm_prefix: "/usr/local/lib/npm" node_version: 14.x -yarn_version: 1.22.4 +yarn_version: 1.22.19 # use the last stable version #---------------------------------------------------------------------- # App variables From 85361393e844c6fb8d744fd3628f6d9bf11b342c Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Bellet Date: Tue, 22 Nov 2022 14:38:26 +0100 Subject: [PATCH 2/6] Upgrade deprecated GH actions: `actions/checkout` --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5e642add0..e72542c88 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -10,7 +10,7 @@ jobs: runs-on: ubuntu-18.04 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - uses: actions/setup-python@v2 with: @@ -27,7 +27,7 @@ jobs: playbook-tests: runs-on: ubuntu-18.04 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - uses: actions/setup-python@v2 with: From 848029099feaf83e79e00c3dd73919cb93cea08b Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Bellet Date: Tue, 22 Nov 2022 14:38:44 +0100 Subject: [PATCH 3/6] Upgrade deprecated GH actions: `actions/setup-python` --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e72542c88..17810a2f3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -12,7 +12,7 @@ jobs: steps: - uses: actions/checkout@v3 - - uses: actions/setup-python@v2 + - uses: actions/setup-python@v4 with: python-version: '2.7' @@ -29,7 +29,7 @@ jobs: steps: - uses: actions/checkout@v3 - - uses: actions/setup-python@v2 + - uses: actions/setup-python@v4 with: python-version: '2.7' From 56e265651b9a0535302d83d48f3fcd3c3db859fa Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Bellet Date: Tue, 22 Nov 2022 14:39:03 +0100 Subject: [PATCH 4/6] Upgrade deprecated GH actions: `actions/cache` --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 17810a2f3..ddc850bf8 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -40,7 +40,7 @@ jobs: - name: Cache Ruby binary compiling id: cache-ruby - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: ~/.rbenv key: ${{ runner.os }}-ruby-${{ github.sha }} From a8ffd0244ce28f6ec31bab15f9bc3a7d487a32e6 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Bellet Date: Tue, 22 Nov 2022 15:32:07 +0100 Subject: [PATCH 5/6] Upgrade python version to `3.8.2` --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ddc850bf8..f2324117a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -14,7 +14,7 @@ jobs: - uses: actions/setup-python@v4 with: - python-version: '2.7' + python-version: '3.8.2' - name: Set up Ansible run: | @@ -31,7 +31,7 @@ jobs: - uses: actions/setup-python@v4 with: - python-version: '2.7' + python-version: '3.8.2' - name: Set up Ansible run: | From b1f074edfe77111d5415bf3529908d439660d7f4 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Bellet Date: Wed, 23 Nov 2022 09:33:07 +0100 Subject: [PATCH 6/6] Specify jinja version as seems to be incompatible with python > 3 Ref: https://github.com/openfoodfoundation/ofn-install/issues/842 --- requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements.txt b/requirements.txt index 7a140216b..de589b3ae 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,4 @@ ansible==2.9.20 ansible-lint==4.2.0 yamllint==1.21.0 +jinja2<3.1