From 1b7094ffecaa1116edbdadc75cd97734ce000a7c Mon Sep 17 00:00:00 2001 From: Adam Olech Date: Wed, 3 Nov 2021 14:40:09 +0100 Subject: [PATCH 1/2] ci: add non-preemptible exceptions Signed-off-by: Adam Olech --- .github/scripts/generate_job_matrix.py | 11 +++++++++-- .github/workflows/sphinx-tuttest.yml | 1 + 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/.github/scripts/generate_job_matrix.py b/.github/scripts/generate_job_matrix.py index a610921..b2c5509 100755 --- a/.github/scripts/generate_job_matrix.py +++ b/.github/scripts/generate_job_matrix.py @@ -11,6 +11,11 @@ examples = [ "hello-a" ] +non_preemptible = [ + "litex", + "litex_linux" +] + jobs = [] osvers = [ @@ -29,14 +34,16 @@ for osver in osvers: 'fpga-fam': "xc7", 'os': osver[0], 'os-version': osver[1], - 'example': example + 'example': example, + 'preemptible': str(example not in non_preemptible).lower(), } for example in examples] jobs += [{ 'fpga-fam': "eos-s3", 'os': osver[0], 'os-version': osver[1], - 'example': "counter" + 'example': "counter", + 'preemptible': str(True).lower(), } for osver in osvers] print('::set-output name=matrix::' + str(jobs)) diff --git a/.github/workflows/sphinx-tuttest.yml b/.github/workflows/sphinx-tuttest.yml index de0c2ed..6685caf 100644 --- a/.github/workflows/sphinx-tuttest.yml +++ b/.github/workflows/sphinx-tuttest.yml @@ -35,6 +35,7 @@ jobs: env: LANG: "en_US.UTF-8" DEBIAN_FRONTEND: "noninteractive" + GHA_PREEMPTIBLE: ${{ matrix.preemptible }} container: ${{matrix.os}}:${{matrix.os-version}} From 54a3e0974da10a0e0880a49cff2b5c6f3fa40196 Mon Sep 17 00:00:00 2001 From: Adam Olech Date: Fri, 5 Nov 2021 09:33:12 +0100 Subject: [PATCH 2/2] ci: make all jobs use non-preemptible machines Signed-off-by: Adam Olech --- .github/scripts/generate_job_matrix.py | 11 ++--------- .github/workflows/sphinx-tuttest.yml | 2 +- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/.github/scripts/generate_job_matrix.py b/.github/scripts/generate_job_matrix.py index b2c5509..a610921 100755 --- a/.github/scripts/generate_job_matrix.py +++ b/.github/scripts/generate_job_matrix.py @@ -11,11 +11,6 @@ examples = [ "hello-a" ] -non_preemptible = [ - "litex", - "litex_linux" -] - jobs = [] osvers = [ @@ -34,16 +29,14 @@ for osver in osvers: 'fpga-fam': "xc7", 'os': osver[0], 'os-version': osver[1], - 'example': example, - 'preemptible': str(example not in non_preemptible).lower(), + 'example': example } for example in examples] jobs += [{ 'fpga-fam': "eos-s3", 'os': osver[0], 'os-version': osver[1], - 'example': "counter", - 'preemptible': str(True).lower(), + 'example': "counter" } for osver in osvers] print('::set-output name=matrix::' + str(jobs)) diff --git a/.github/workflows/sphinx-tuttest.yml b/.github/workflows/sphinx-tuttest.yml index 6685caf..ce94795 100644 --- a/.github/workflows/sphinx-tuttest.yml +++ b/.github/workflows/sphinx-tuttest.yml @@ -35,7 +35,7 @@ jobs: env: LANG: "en_US.UTF-8" DEBIAN_FRONTEND: "noninteractive" - GHA_PREEMPTIBLE: ${{ matrix.preemptible }} + GHA_PREEMPTIBLE: "false" container: ${{matrix.os}}:${{matrix.os-version}}