Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix public_network variable in task_swarm.yml #106

Merged
merged 2 commits into from
Nov 15, 2024
Merged

Fix public_network variable in task_swarm.yml #106

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4141dfd
Fix public_network variable in task_swarm.yml
davisagli Nov 15, 2024
692fa64
Fix CI
davisagli Nov 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 4 additions & 6 deletions .github/workflows/frontend_addon.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
Expand All @@ -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: |
Expand Down
13 changes: 10 additions & 3 deletions .github/workflows/project.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,11 @@ on:
- ".github/workflows/project.yml"
workflow_dispatch:

jobs:
env:
NODE_VERSION: 22.x

jobs:
generation:

runs-on: ubuntu-latest

strategy:
Expand All @@ -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: |
Expand Down
5 changes: 2 additions & 3 deletions project/{{ cookiecutter.__folder_name }}/devops/tasks/swarm/task_swarm.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@

- name: "Docker Swarm: Initial Setup"
block:

- name: "Docker Swarm: Init Swarm"
community.docker.docker_swarm:
state: present
Expand All @@ -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
Expand Down