Skip to content

Commit

Permalink
Merge branch 'master' into preimrep
Browse files Browse the repository at this point in the history
  • Loading branch information
cdwensley authored Oct 27, 2022
2 parents 803d522 + bb27ae1 commit 84461e6
Show file tree
Hide file tree
Showing 279 changed files with 1,860 additions and 1,574 deletions.
31 changes: 16 additions & 15 deletions .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [ubuntu-18.04]
os: [ubuntu-latest]
shell: [bash]
test-suites:
[
Expand All @@ -67,12 +67,12 @@ jobs:
# also test `make install` here, as that wants the manual, too;
# and set NO_COVERAGE=1 to ensure the installed GAP binaries don't
# contain references to the build directory
- os: ubuntu-18.04
- os: ubuntu-latest
shell: bash
test-suites: "makemanuals testmakeinstall"
extra: "GAPPREFIX=/tmp/gapprefix CONFIGFLAGS=\"--prefix=/tmp/gapprefix\" NO_COVERAGE=1"

- os: ubuntu-18.04
- os: ubuntu-latest
shell: bash
test-suites: "teststandard"
extra: "ABI=32 CONFIGFLAGS=\"\""
Expand All @@ -81,15 +81,15 @@ jobs:
# but somehow when running on GitHub Actions, it takes almost 4
# hours (!) to complete instead of 25 minutes. So for now we just
# run testinstall.
- os: ubuntu-18.04
- os: ubuntu-latest
shell: bash
test-suites: "testinstall"
extra: "HPCGAP=yes ABI=64"

# compile packages and run GAP tests in 32 bit mode
# it seems profiling is having trouble collecting the coverage data
# here, so we use NO_COVERAGE=1
- os: ubuntu-18.04
- os: ubuntu-18.04 # TODO: in ubuntu-latest, the 32bit tests don't work...
shell: bash
test-suites: "testpackages testinstall-loadall"
extra: "ABI=32 NO_COVERAGE=1"
Expand Down Expand Up @@ -120,7 +120,7 @@ jobs:
# The '--enable-valgrind' checks that GAP builds and runs correctly
# when compiled with valgrind support. We do not actually run any
# tests using valgrind, as it is too slow.
- os: ubuntu-18.04
- os: ubuntu-latest
shell: bash
test-suites: "testbuildsys testmockpkg testinstall"
extra: "NO_COVERAGE=1 ABI=64 BUILDDIR=out-of-tree
Expand All @@ -129,7 +129,7 @@ jobs:

# same as above, but in 32 bit mode, also turn off debugging (see
# elsewhere in this file for an explanation).
- os: ubuntu-18.04
- os: ubuntu-latest
shell: bash
test-suites: "testbuildsys testmockpkg testinstall"
extra: "NO_COVERAGE=1 ABI=32 BUILDDIR=out-of-tree CONFIGFLAGS=\"\""
Expand All @@ -152,17 +152,17 @@ jobs:
TEST_SUITES: ${{ matrix.test-suites }}

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- name: "Set up Python 3.7"
uses: actions/setup-python@v2
- name: "Set up Python"
uses: actions/setup-python@v4
with:
python-version: 3.7
python-version: 3.9

- uses: gap-actions/setup-cygwin@v1
if: ${{ runner.os == 'Windows' }}
with:
PKGS_TO_INSTALL: 'wget,git,gcc-g++,gcc-core,m4,libgmp-devel,make,automake,libtool,autoconf,autoconf2.5,zlib-devel,libreadline-devel,libmpc-devel,libmpfr-devel,xdg-utils'
PKGS_TO_INSTALL: 'wget,git,gcc-g++,gcc-core,m4,libgmp-devel,make,automake,libtool,autoconf,autoconf2.5,zlib-devel,libreadline-devel,libmpc-devel,libmpfr-devel,xdg-utils,pkg-config'

# There are two cygwin installs on github actions (ours,
# and a preinstalled one which we can't use as not enough packages are installed.
Expand Down Expand Up @@ -228,8 +228,9 @@ jobs:
fi
sudo apt-get update
sudo apt-get install --no-install-recommends "${packages[@]}"
sudo apt-get install pkg-config
elif [ "$RUNNER_OS" == "macOS" ]; then
brew install gmp zlib
brew install gmp zlib pkg-config
fi
python -m pip install gcovr
Expand Down Expand Up @@ -279,7 +280,7 @@ jobs:
- name: "Gather coverage data"
run: ${{ matrix.extra }} dev/ci-gather-coverage.sh
- name: "Upload coverage data to Codecov"
uses: codecov/codecov-action@v2
uses: codecov/codecov-action@v3
with:
token: ${{ secrets.CODECOV_TOKEN }}

Expand All @@ -295,7 +296,7 @@ jobs:
steps:
- name: Get branch name
id: get-branch
run: echo ::set-output name=branch::${GITHUB_REF#refs/*/}
run: echo "branch=${GITHUB_REF#refs/*/}" >> $GITHUB_OUTPUT
- name: Determine whether CI status changed
uses: gap-actions/should-i-notify-action@v1
id: should_notify
Expand Down
37 changes: 29 additions & 8 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
gap-build-version: ${{ steps.get-build.outputs.name }}

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
fetch-depth: 0

Expand All @@ -57,7 +57,9 @@ jobs:
git fetch --tags --force
- name: "Set up Python"
uses: actions/setup-python@v2
uses: actions/setup-python@v4
with:
python-version: 3.9
- name: "Install Python modules"
run: pip3 install PyGithub python-dateutil
- name: "Install latex"
Expand All @@ -79,12 +81,29 @@ jobs:
run: |
BUILD=`head -1 cnf/GAP-VERSION-FILE | cut -d ' ' -f3`
echo "steps.get-build.outputs.name = ${BUILD}"
echo "::set-output name=name::${BUILD}"
echo "name=${BUILD}" >> $GITHUB_OUTPUT
- name: "Download packages"
run: dev/ci-download-pkgs.sh
- name: "Make archives"
run: python -u ./dev/releases/make_archives.py

- name: "Test building GAP from the primary release archive"
run: |
mkdir -p test-gap-tarball
pushd test-gap-tarball
tar xvf ../tmp/gap-${{ steps.get-build.outputs.name }}.tar.gz
cd gap*
# test building GAP
./configure --prefix=/tmp/gapprefix
make -j8
popd
- name: "Test 'make install' from the primary release archive"
run: |
pushd test-gap-tarball/gap*
GAPPREFIX=/tmp/gapprefix TEST_SUITES="testmakeinstall" ../../dev/ci.sh
popd
# Upload the main GAP .tar.gz file (which includes packages).
# We only upload this tarball in order to minimise our demand on GitHub's
# resources, and that is why we also only upload these for the daily cron
Expand Down Expand Up @@ -126,7 +145,7 @@ jobs:
CYGWIN_MATRIX='{"arch":["x86_64","x86"]}'
fi
echo "Setting Cygwin matrix: $CYGWIN_MATRIX"
echo "::set-output name=matrix::$CYGWIN_MATRIX"
echo "matrix=$CYGWIN_MATRIX" >> $GITHUB_OUTPUT
cygwin:
name: "Create Windows ${{ matrix.arch }} installer"
Expand Down Expand Up @@ -207,15 +226,17 @@ jobs:
# artifact would/could already contain the appropriate packages.

- name: "Clone GAP"
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
path: ${{ env.GAPDEV_DIR }}

- name: "Copy GAP's release scripts to a safe place"
run: cp -rp ${GAPDEV_DIR}/dev/releases .

- uses: actions/setup-python@v2
- uses: actions/setup-python@v4
if: ${{ startsWith(github.ref, 'refs/tags/v') }}
with:
python-version: 3.9

- name: "Install required Python modules"
if: ${{ startsWith(github.ref, 'refs/tags/v') }}
Expand All @@ -239,7 +260,7 @@ jobs:
# organisation, and perhaps ultimately it could/should be re-integrated
# with the original sagemath/sage-windows repository.
- name: "Clone the Windows installer maker scripts"
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
repository: ChrisJefferson/sage-windows
ref: master
Expand Down Expand Up @@ -302,7 +323,7 @@ jobs:
steps:
- name: Get branch name
id: get-branch
run: echo ::set-output name=branch::${GITHUB_REF#refs/*/}
run: echo "branch=${GITHUB_REF#refs/*/}" >> $GITHUB_OUTPUT
- name: Determine whether CI status changed
uses: gap-actions/should-i-notify-action@v1
id: should_notify
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/update-gh-pages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,10 @@ jobs:
make bootstrap-pkg-minimal
- name: Setup Pages
id: pages
uses: actions/configure-pages@v1
uses: actions/configure-pages@v2
- name: Build GAP manuals
run: |
make html # we are only intersted in the HTML version
make html # we are only interested in the HTML version
- name: Bundling GAP manuals for deployment
run: |
set -e
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
/confdefs.h
/conftest*
/libtool
/libgap.pc
/src/config.h.in
/src/config.h.in~

Expand Down
Loading

0 comments on commit 84461e6

Please sign in to comment.