Skip to content

Commit 6b893a7

Browse files
committed
ci build updates
1 parent 9f7bb9a commit 6b893a7

File tree

10 files changed

+33
-32
lines changed

10 files changed

+33
-32
lines changed

.github/workflows/TIRPC.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
#!/bin/bash
2+
set -e
3+
4+
echo "TIRPC=YES" >> ./configure/CONFIG_SITE.local
5+
echo "DRV_VXI11=YES" >> ./configure/CONFIG_SITE.local

.github/workflows/ci-scripts-build.yml

Lines changed: 20 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ on:
2020

2121
env:
2222
SETUP_PATH: .github/workflows:.ci
23-
# For the sequencer on Linux/Windows/MacOS
24-
APT: re2c
23+
# For sequencer and asyn
24+
APT: re2c libtirpc-dev libreadline-dev
2525
CHOCO: re2c
2626
BREW: re2c
2727

@@ -44,44 +44,48 @@ jobs:
4444
matrix:
4545
# Job names also name artifacts, character limitations apply
4646
include:
47-
- os: ubuntu-20.04
47+
- os: ubuntu-24.04
4848
cmp: gcc
4949
configuration: default
50-
set: stable_7_0
50+
set: linux-stable
51+
base: "7.0"
5152
name: "Linux stable 7.0"
52-
53-
- os: ubuntu-20.04
53+
54+
- os: ubuntu-24.04
5455
cmp: gcc
5556
configuration: default
56-
set: stable_3_15
57+
set: linux-stable
58+
base: "3.15"
5759
name: "Linux stable 3.15"
5860

59-
- os: ubuntu-20.04
61+
- os: ubuntu-24.04
6062
cmp: gcc
6163
configuration: default
62-
set: master_7_0
64+
set: linux-master
65+
base: "7.0"
6366
name: "Linux master 7.0"
64-
65-
- os: ubuntu-20.04
67+
68+
- os: ubuntu-24.04
6669
cmp: gcc
6770
configuration: default
68-
set: master_3_15
71+
set: linux-master
72+
base: "3.15"
6973
name: "Linux master 3.15"
7074

7175
- os: macos-latest
7276
cmp: clang
7377
configuration: default
74-
set: master_7_0
78+
set: macos
7579
name: "MacOS master 7.0"
7680

7781
- os: windows-2022
7882
cmp: vs2022
7983
configuration: static
80-
set: master_7_0
84+
set: windows
8185
name: "Windows master 7.0"
8286

8387
steps:
84-
- uses: actions/checkout@v3
88+
- uses: actions/checkout@v4
8589
with:
8690
submodules: true
8791
- name: Automatic core dumper analysis
@@ -105,7 +109,7 @@ jobs:
105109
- name: Run main module tests
106110
run: python .ci/cue.py -T 15M test
107111
- name: Upload tapfiles Artifact
108-
uses: actions/upload-artifact@v3
112+
uses: actions/upload-artifact@v4
109113
with:
110114
name: tapfiles ${{ matrix.name }}
111115
path: '**/O.*/*.tap'

.github/workflows/linux-master.set

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
include master
2+
3+
ASYN_HOOK=.github/workflows/TIRPC.sh

.github/workflows/linux-stable.set

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
include stable
2+
3+
ASYN_HOOK=.github/workflows/TIRPC.sh

.github/workflows/macos.set

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
include master
Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
BASE="7.0"
2-
31
MODULES="sncseq asyn"
42

53
ASYN="master"

.github/workflows/master_3_15.set

Lines changed: 0 additions & 6 deletions
This file was deleted.
Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
BASE="3.15"
2-
31
MODULES="sncseq asyn"
42

53
ASYN="R4-42"

.github/workflows/stable_7_0.set

Lines changed: 0 additions & 6 deletions
This file was deleted.

.github/workflows/windows.set

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
include master

0 commit comments

Comments
 (0)