Skip to content

Commit 35cdb4d

Browse files
authored
[CI] Enable self hosted launchers (#6407)
* Modify trigger build action to try launching it on the self hosted launcher * Use python3 instead * Add launchers to reboot action
1 parent 7d64f03 commit 35cdb4d

2 files changed

Lines changed: 13 additions & 21 deletions

File tree

‎.github/workflows/CI_reboot_builders.yml‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ on:
1111
builder-os:
1212
type: choice
1313
description: On which OS run the binaries generation
14-
options:
14+
options:
1515
- '["sofa-ci-dev-ubuntu2404-0"]'
1616
- '["sofa-ci-dev-ubuntu2404-1"]'
1717
- '["sofa-ci-dev-ubuntu2404-2"]'
@@ -23,14 +23,16 @@ on:
2323
- '["consortium-macos-2-1"]'
2424
- '["consortium-macos-3-1"]'
2525
- '["sofa-ci-dev-ubuntu2404-0","sofa-ci-dev-ubuntu2404-1","sofa-ci-dev-ubuntu2404-2","sofa-ci-dev-ubuntu2404-3","sofa-ci-dev-ubuntu2404-4","sofa-ci-dev-ubuntu2404-5","sofa-ci-dev-ubuntu2404-6","sofa-ci-dev-ubuntu2404-7","consortium-macos-2-1","consortium-macos-3-1"]'
26-
default: '["sofa-ci-dev-ubuntu2404-0","sofa-ci-dev-ubuntu2404-1","sofa-ci-dev-ubuntu2404-2","sofa-ci-dev-ubuntu2404-3","sofa-ci-dev-ubuntu2404-4","sofa-ci-dev-ubuntu2404-5","sofa-ci-dev-ubuntu2404-6","sofa-ci-dev-ubuntu2404-7","consortium-macos-2-1","consortium-macos-3-1"]'
26+
- '["sofa-ci-dev-github-launcher-0-0","sofa-ci-dev-github-launcher-1-0","sofa-ci-dev-github-launcher-2-0","sofa-ci-dev-github-launcher-3-0"]'
27+
- '["sofa-ci-dev-ubuntu2404-0","sofa-ci-dev-ubuntu2404-1","sofa-ci-dev-ubuntu2404-2","sofa-ci-dev-ubuntu2404-3","sofa-ci-dev-ubuntu2404-4","sofa-ci-dev-ubuntu2404-5","sofa-ci-dev-ubuntu2404-6","sofa-ci-dev-ubuntu2404-7","consortium-macos-2-1","consortium-macos-3-1","sofa-ci-dev-github-launcher-0-0","sofa-ci-dev-github-launcher-1-0","sofa-ci-dev-github-launcher-2-0","sofa-ci-dev-github-launcher-3-0"]'
28+
default: '["sofa-ci-dev-ubuntu2404-0","sofa-ci-dev-ubuntu2404-1","sofa-ci-dev-ubuntu2404-2","sofa-ci-dev-ubuntu2404-3","sofa-ci-dev-ubuntu2404-4","sofa-ci-dev-ubuntu2404-5","sofa-ci-dev-ubuntu2404-6","sofa-ci-dev-ubuntu2404-7","consortium-macos-2-1","consortium-macos-3-1","sofa-ci-dev-github-launcher-0-0","sofa-ci-dev-github-launcher-1-0","sofa-ci-dev-github-launcher-2-0","sofa-ci-dev-github-launcher-3-0"]'
2729

2830

2931

3032
# Nightly build
3133
schedule:
3234
- cron: '30 1 * * *' # Evevery night @1:30 a.m.
33-
35+
3436
# ===============================================================
3537
# ===============================================================
3638

@@ -45,14 +47,14 @@ jobs:
4547
os: ${{ fromJson(inputs.builder-os) }}
4648
runs-on: ${{ matrix.os }}
4749
steps:
48-
- name: Clear ccache
50+
- name: Clear ccache
4951
if: ${{ runner.os == 'Linux' }}
5052
shell: bash
5153
run: |
5254
if [[ -n "$BUILDER_CACHE_DIR" ]]; then
5355
rm -rf $BUILDER_CACHE_DIR/*
54-
fi
55-
56+
fi
57+
5658
- name: Reboot builder
5759
shell: bash
5860
run: |
@@ -65,16 +67,16 @@ jobs:
6567
strategy:
6668
fail-fast: false
6769
matrix:
68-
os: ["sofa-ci-dev-ubuntu2204-0","sofa-ci-dev-ubuntu2204-1","sofa-ci-dev-ubuntu2204-2","sofa-ci-dev-ubuntu2204-3","sofa-ci-dev-ubuntu2204-4","consortium-macos-2-1","consortium-macos-3-1"]
70+
os: ["sofa-ci-dev-ubuntu2404-0","sofa-ci-dev-ubuntu2404-1","sofa-ci-dev-ubuntu2404-2","sofa-ci-dev-ubuntu2404-3","sofa-ci-dev-ubuntu2404-4","sofa-ci-dev-ubuntu2404-5","sofa-ci-dev-ubuntu2404-6","sofa-ci-dev-ubuntu2404-7","consortium-macos-2-1","consortium-macos-3-1","sofa-ci-dev-github-launcher-0-0","sofa-ci-dev-github-launcher-1-0","sofa-ci-dev-github-launcher-2-0","sofa-ci-dev-github-launcher-3-0"]
6971
runs-on: ${{ matrix.os }}
7072
steps:
71-
- name: Clear ccache
73+
- name: Clear ccache
7274
if: ${{ runner.os == 'Linux' }}
7375
shell: bash
7476
run: |
7577
if [[ -n "$BUILDER_CACHE_DIR" ]]; then
7678
rm -rf $BUILDER_CACHE_DIR/*
77-
fi
79+
fi
7880
7981
- name: Reboot builder
8082
shell: bash

‎.github/workflows/CI_trigger_build_and_tests.yml‎

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ on:
6666
jobs:
6767
# Filter build handling : push in master, commits in PR, comments in PR and dispatch
6868
filter_build:
69-
runs-on: ubuntu-latest
69+
runs-on: launcher
7070
if: ${{ github.repository_owner == 'sofa-framework' }}
7171
permissions:
7272
contents: read
@@ -160,16 +160,6 @@ jobs:
160160
echo 'SH_BUILDER_OS=[]' >> $GITHUB_ENV
161161
fi
162162
163-
- name: Set up python
164-
uses: actions/setup-python@v5
165-
with:
166-
python-version: ${{ env.PYTHON_VERSION }}
167-
168-
- name: Install pip packages
169-
run: |
170-
pip install python-graphql-client
171-
pip install requests
172-
173163
- name: Check out code
174164
uses: actions/checkout@v5
175165
with:
@@ -199,7 +189,7 @@ jobs:
199189
200190
# Trigger the Build action
201191
# Warning ! This script also changes ENV variables
202-
python ci/scripts/checkPRInfoBeforeBuild.py
192+
python3 ci/scripts/checkPRInfoBeforeBuild.py
203193
204194
- name: Export environment variables as outputs
205195
id: export-vars

0 commit comments

Comments
 (0)