Merge pull request #106 from plone/fix-ansible-swarm

Fix public_network variable in task_swarm.yml
plone · Nov 15, 2024 · e0d452f · e0d452f
2 parents 560ee7a + 692fa64
commit e0d452f
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 12 deletions.
diff --git a/.github/workflows/frontend_addon.yml b/.github/workflows/frontend_addon.yml
@@ -7,13 +7,11 @@ on:
   workflow_dispatch:
 
 env:
-  NODE_VERSION: 20.x
+  NODE_VERSION: 22.x
   PYTHON_VERSION: "3.10"
 
 jobs:
-
   generation:
-
     runs-on: ubuntu-latest
 
     strategy:
@@ -34,7 +32,7 @@ jobs:
         uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
-          cache: 'pip'
+          cache: "pip"
 
       # python install
       - name: Install dependencies
@@ -57,8 +55,8 @@ jobs:
       - name: Set up Python ${{ env.PYTHON_VERSION }}
         uses: actions/setup-python@v5
         with:
-          python-version: '${{ env.PYTHON_VERSION }}'
-          cache: 'pip'
+          python-version: "${{ env.PYTHON_VERSION }}"
+          cache: "pip"
 
       - name: Install dependencies
         run: |

diff --git a/.github/workflows/project.yml b/.github/workflows/project.yml
@@ -6,10 +6,11 @@ on:
       - ".github/workflows/project.yml"
   workflow_dispatch:
 
-jobs:
+env:
+  NODE_VERSION: 22.x
 
+jobs:
   generation:
-
     runs-on: ubuntu-latest
 
     strategy:
@@ -30,13 +31,19 @@ jobs:
         uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
-          cache: 'pip'
+          cache: "pip"
 
       # python install
       - name: Install dependencies
         run: |
           pip install -r requirements.txt
 
+      # Node setup
+      - name: Use Node.js ${{ env.NODE_VERSION }}
+        uses: actions/setup-node@v4
+        with:
+          node-version: ${{ env.NODE_VERSION }}
+
       # Test
       - name: Run tests
         run: |

diff --git a/project/{{ cookiecutter.__folder_name }}/devops/tasks/swarm/task_swarm.yml b/project/{{ cookiecutter.__folder_name }}/devops/tasks/swarm/task_swarm.yml
@@ -4,7 +4,6 @@
 
 - name: "Docker Swarm: Initial Setup"
   block:
-
     - name: "Docker Swarm: Init Swarm"
       community.docker.docker_swarm:
         state: present
@@ -17,12 +16,12 @@
   block:
     - name: "Docker Swarm: Check for public network"
       community.docker.docker_network_info:
-        name: "{{ cookiecutter.__devops_swarm_public_network }}"
+        name: "{{ swarm.public_network }}"
       register: docker_swarm_net_public
 
     - name: "Docker Swarm: Create public network"
       community.docker.docker_network:
-        name: "{{ cookiecutter.__devops_swarm_public_network }}"
+        name: "{{ swarm.public_network }}"
         internal: false
         attachable: true
         driver: overlay