Skip to content

Commit 9402caf

Browse files
ci: don't use BuildPackages.sh directly
1 parent 34efbc1 commit 9402caf

3 files changed

Lines changed: 9 additions & 30 deletions

File tree

.github/workflows/config-options.yml

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,10 @@ jobs:
3131
override_cache_key_fallback: ${{ runner.os }}-$GAPBRANCH-64
3232
- name: "Install GAP"
3333
uses: gap-actions/setup-gap@v3
34-
- name: "Build necessary GAP packages"
35-
run: |
36-
cd ${GAPROOT}/pkg
37-
../bin/BuildPackages.sh --strict digraphs io orb datastructures profiling
3834
- name: "Build Semigroups"
3935
uses: gap-actions/build-pkg@v3
4036
with:
41-
CONFIGFLAGS: --enable-debug
37+
configflags: --enable-debug
4238
- name: "Run Semigroups package's tst/teststandard.g"
4339
uses: gap-actions/run-pkg-tests@v4
4440

@@ -50,14 +46,10 @@ jobs:
5046
# Don't use ccache, since sometimes this fails when using -mavx
5147
- name: "Install GAP"
5248
uses: gap-actions/setup-gap@v3
53-
- name: "Build necessary GAP packages"
54-
run: |
55-
cd ${GAPROOT}/pkg
56-
../bin/BuildPackages.sh --strict digraphs io orb datastructures profiling
5749
- name: "Build Semigroups"
5850
uses: gap-actions/build-pkg@v3
5951
with:
60-
CONFIGFLAGS: --enable-hpcombi
52+
configflags: --enable-hpcombi
6153
- name: "Run Semigroups package's tst/teststandard.g"
6254
uses: gap-actions/run-pkg-tests@v4
6355
- uses: gap-actions/process-coverage@v3
@@ -97,14 +89,10 @@ jobs:
9789
- run: mkdir libsemigroups
9890
- name: "Install GAP"
9991
uses: gap-actions/setup-gap@v3
100-
- name: "Build necessary GAP packages"
101-
run: |
102-
cd ${GAPROOT}/pkg
103-
../bin/BuildPackages.sh --strict digraphs io orb datastructures profiling
10492
- name: "Build Semigroups"
10593
uses: gap-actions/build-pkg@v3
10694
with:
107-
CONFIGFLAGS: --with-external-libsemigroups
95+
configflags: --with-external-libsemigroups
10896
- name: "Run Semigroups package's tst/teststandard.g"
10997
uses: gap-actions/run-pkg-tests@v4
11098

.github/workflows/standard.yml

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
- macOS
3030
gap-version:
3131
- master
32-
- stable-4.15
32+
- v4.15
3333
- v4.14
3434
- v4.13
3535
- v4.12
@@ -39,7 +39,7 @@ jobs:
3939
include:
4040
- os: Windows
4141
gap-version: latest
42-
configflags: "--disable-fmt --disable-hpcombi" # to try and speed up compilation FIXME don't disable hpcombi
42+
configflags: "--disable-hpcombi"
4343

4444
steps:
4545
- uses: actions/checkout@v6
@@ -70,15 +70,10 @@ jobs:
7070
rm -rf ${GAPROOT}/pkg/${PKGNAME}*
7171
git clone $PKG ${GAPROOT}/pkg/${PKGNAME}
7272
done
73-
- name: "Build necessary GAP packages"
74-
shell: bash
75-
run: |
76-
cd ${GAPROOT}/pkg
77-
../bin/BuildPackages.sh --strict digraphs* io* orb* datastructures* profiling*
7873
- name: "Build Semigroups"
7974
uses: gap-actions/build-pkg@v3
8075
with:
81-
CONFIGFLAGS: ${{ matrix.configflags }}
76+
configflags: ${{ matrix.configflags }}
8277
- name: "Run Semigroups package's tst/teststandard.g"
8378
uses: gap-actions/run-pkg-tests@v4
8479
- uses: gap-actions/process-coverage@v3

.github/workflows/valgrind.yml

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ concurrency:
1919

2020
jobs:
2121
test-valgrind:
22-
name: "Ubuntu / GAP stable-4.15 / valgrind"
22+
name: "Ubuntu / GAP 4.15 / valgrind"
2323
runs-on: ubuntu-latest
2424
env:
2525
NO_COVERAGE: true
@@ -35,16 +35,12 @@ jobs:
3535
- name: "Install GAP . . ."
3636
uses: gap-actions/setup-gap@v3
3737
with:
38-
gap-version: stable-4.15
38+
gap-version: v4.15
3939
configflags: --enable-valgrind
40-
- name: "Build additional necessary GAP packages . . ."
41-
run: |
42-
cd ${GAPROOT}/pkg
43-
../bin/BuildPackages.sh --strict digraphs* io* orb* datastructures* profiling*
4440
- name: "Build Semigroups . . ."
4541
uses: gap-actions/build-pkg@v3
4642
with:
47-
CONFIGFLAGS: --disable-hpcombi
43+
configflags: --disable-hpcombi
4844
- name: "Run SemigroupsTestInstall . . ."
4945
uses: gap-actions/run-pkg-tests@v4
5046
with:

0 commit comments

Comments
 (0)