Skip to content

Commit

Permalink
Catch-up merge from master into branch/2023-01-19/review-procedure
Browse files Browse the repository at this point in the history
  • Loading branch information
rptb1 committed Nov 9, 2023
2 parents 586336a + e2f9497 commit 654c24c
Show file tree
Hide file tree
Showing 130 changed files with 5,743 additions and 1,072 deletions.
21 changes: 21 additions & 0 deletions .github/workflows/fixme-check.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
# .github/workflows/fixme-check.yml -- check for FIXME task labels
#
# This is a GitHub CI workflow
# <https://docs.github.com/en/actions/automating-builds-and-tests/about-continuous-integration>
# to check for FIXME and similar task labels left unresolved in the
# MPS source tree.

name: FIXME check

on:
# Run as part of CI checks on branch push and on merged pull request.
- push
- pull_request
- workflow_dispatch # allow manual triggering

jobs:
check-fixme:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- run: tool/check-fixme
23 changes: 23 additions & 0 deletions .github/workflows/rst-check.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# .github/workflows/rst-check.yml -- check syntax of reStructuredText files
#
# This is a GitHub CI workflow
# <https://docs.github.com/en/actions/using-workflows/about-workflows>
# to check the syntax of reStructuredText files.

name: reStructuredText syntax check

on:
# Run as part of CI checks on branch push and on merged pull request.
- push
- pull_request
- workflow_dispatch # allow manual triggering

jobs:
check-rst:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Install docutils
run: sudo apt-get install -y docutils
- name: Check reStructuredText syntax
run: tool/check-rst
23 changes: 23 additions & 0 deletions .github/workflows/shell-script-check.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# .github/workflows/shell-script-check.yml -- check shell scripts
#
# This is a GitHub CI workflow
# <https://docs.github.com/en/actions/using-workflows/about-workflows>
# to check shell scripts.

name: shell script check

on:
# Run as part of CI checks on branch push and on merged pull request.
- push
- pull_request
- workflow_dispatch # allow manual triggering

jobs:
check-shell-scripts:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Install shellcheck
run: sudo apt-get install -y shellcheck
- name: Check shell scripts
run: tool/check-shell-scripts
70 changes: 70 additions & 0 deletions .readthedocs.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
# .readthedocs.yaml -- Build configuration for MPS manual on Read The Docs
#
# Copyright (c) 2023 Ravenbrook Limited. See end of file for license.
#
# This file controls how Read the Docs builds and publishes the MPS
# manual at <https://memory-pool-system.readthedocs.io/>.
#
# See <https://docs.readthedocs.io/en/stable/config-file/v2.html> for
# the file format.
#
# Project configuration is at
# <https://readthedocs.org/projects/memory-pool-system/>. The GitHub
# Ravenbot user <sysadmins@ravenbrook.com> is an administrator
# <https://readthedocs.org/profiles/Ravenbot/>.

version: 2

build:
os: ubuntu-22.04
tools:
python: '3'

python:
install:
- requirements: manual/requirements.pip

sphinx:
configuration: manual/source/conf.py
fail_on_warning: true

# A. REFERENCES
#
# [Readthedocs] "Read the Docs: Documentation Simplified";
# <https://docs.readthedocs.io/en/stable/>.
#
#
# B. DOCUMENT HISTORY
#
# 2023-02-02 RB Created as part of MPS GitHub migration.
#
#
# C. COPYRIGHT AND LICENSE
#
# Copyright © 2023 Ravenbrook Limited <https://www.ravenbrook.com/>.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are
# met:
#
# 1. Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
#
# 2. Redistributions in binary form must reproduce the above copyright
# notice, this list of conditions and the following disclaimer in the
# documentation and/or other materials provided with the distribution.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
# HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
#
# $Id$
8 changes: 5 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,11 @@
# See design.mps.test.ci.

# Some branches don't need builds. Add them here to avoid using build
# resources and unnecessary build messages. See
# <https://docs.travis-ci.com/user/conditions-v1>.
if: NOT branch IN (branch/2023-01-11/github-ci)
# resources and unnecessary build messages.
branches:
except:
- branch/2023-01-07/pull-request-merge-procedure
- branch/2023-01-11/github-ci

language: c # see <https://docs.travis-ci.com/user/languages/c/>.

Expand Down
3 changes: 1 addition & 2 deletions code/abq.h
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ extern void ABQIterate(ABQ abq, ABQVisitor visitor, void *closure);

typedef struct ABQStruct
{
Sig sig; /* design.mps.sig.field */
Count elements;
Size elementSize;
Index in;
Expand All @@ -54,8 +55,6 @@ typedef struct ABQStruct
METER_DECL(pop)
METER_DECL(peek)
METER_DECL(delete)

Sig sig;
} ABQStruct;

#endif /* abq_h */
Expand Down
Loading

0 comments on commit 654c24c

Please sign in to comment.