Skip to content

Commit 654c24c

Browse files
committed
Catch-up merge from master into branch/2023-01-19/review-procedure
2 parents 586336a + e2f9497 commit 654c24c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

130 files changed

+5743
-1072
lines changed

.github/workflows/fixme-check.yml

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
# .github/workflows/fixme-check.yml -- check for FIXME task labels
2+
#
3+
# This is a GitHub CI workflow
4+
# <https://docs.github.com/en/actions/automating-builds-and-tests/about-continuous-integration>
5+
# to check for FIXME and similar task labels left unresolved in the
6+
# MPS source tree.
7+
8+
name: FIXME check
9+
10+
on:
11+
# Run as part of CI checks on branch push and on merged pull request.
12+
- push
13+
- pull_request
14+
- workflow_dispatch # allow manual triggering
15+
16+
jobs:
17+
check-fixme:
18+
runs-on: ubuntu-latest
19+
steps:
20+
- uses: actions/checkout@v3
21+
- run: tool/check-fixme

.github/workflows/rst-check.yml

+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
# .github/workflows/rst-check.yml -- check syntax of reStructuredText files
2+
#
3+
# This is a GitHub CI workflow
4+
# <https://docs.github.com/en/actions/using-workflows/about-workflows>
5+
# to check the syntax of reStructuredText files.
6+
7+
name: reStructuredText syntax check
8+
9+
on:
10+
# Run as part of CI checks on branch push and on merged pull request.
11+
- push
12+
- pull_request
13+
- workflow_dispatch # allow manual triggering
14+
15+
jobs:
16+
check-rst:
17+
runs-on: ubuntu-latest
18+
steps:
19+
- uses: actions/checkout@v3
20+
- name: Install docutils
21+
run: sudo apt-get install -y docutils
22+
- name: Check reStructuredText syntax
23+
run: tool/check-rst
+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
# .github/workflows/shell-script-check.yml -- check shell scripts
2+
#
3+
# This is a GitHub CI workflow
4+
# <https://docs.github.com/en/actions/using-workflows/about-workflows>
5+
# to check shell scripts.
6+
7+
name: shell script check
8+
9+
on:
10+
# Run as part of CI checks on branch push and on merged pull request.
11+
- push
12+
- pull_request
13+
- workflow_dispatch # allow manual triggering
14+
15+
jobs:
16+
check-shell-scripts:
17+
runs-on: ubuntu-latest
18+
steps:
19+
- uses: actions/checkout@v3
20+
- name: Install shellcheck
21+
run: sudo apt-get install -y shellcheck
22+
- name: Check shell scripts
23+
run: tool/check-shell-scripts

.readthedocs.yaml

+70
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
# .readthedocs.yaml -- Build configuration for MPS manual on Read The Docs
2+
#
3+
# Copyright (c) 2023 Ravenbrook Limited. See end of file for license.
4+
#
5+
# This file controls how Read the Docs builds and publishes the MPS
6+
# manual at <https://memory-pool-system.readthedocs.io/>.
7+
#
8+
# See <https://docs.readthedocs.io/en/stable/config-file/v2.html> for
9+
# the file format.
10+
#
11+
# Project configuration is at
12+
# <https://readthedocs.org/projects/memory-pool-system/>. The GitHub
13+
# Ravenbot user <[email protected]> is an administrator
14+
# <https://readthedocs.org/profiles/Ravenbot/>.
15+
16+
version: 2
17+
18+
build:
19+
os: ubuntu-22.04
20+
tools:
21+
python: '3'
22+
23+
python:
24+
install:
25+
- requirements: manual/requirements.pip
26+
27+
sphinx:
28+
configuration: manual/source/conf.py
29+
fail_on_warning: true
30+
31+
# A. REFERENCES
32+
#
33+
# [Readthedocs] "Read the Docs: Documentation Simplified";
34+
# <https://docs.readthedocs.io/en/stable/>.
35+
#
36+
#
37+
# B. DOCUMENT HISTORY
38+
#
39+
# 2023-02-02 RB Created as part of MPS GitHub migration.
40+
#
41+
#
42+
# C. COPYRIGHT AND LICENSE
43+
#
44+
# Copyright © 2023 Ravenbrook Limited <https://www.ravenbrook.com/>.
45+
#
46+
# Redistribution and use in source and binary forms, with or without
47+
# modification, are permitted provided that the following conditions are
48+
# met:
49+
#
50+
# 1. Redistributions of source code must retain the above copyright
51+
# notice, this list of conditions and the following disclaimer.
52+
#
53+
# 2. Redistributions in binary form must reproduce the above copyright
54+
# notice, this list of conditions and the following disclaimer in the
55+
# documentation and/or other materials provided with the distribution.
56+
#
57+
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
58+
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
59+
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
60+
# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
61+
# HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
62+
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
63+
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
64+
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
65+
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
66+
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
67+
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
68+
#
69+
#
70+
# $Id$

.travis.yml

+5-3
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,11 @@
55
# See design.mps.test.ci.
66

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

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

code/abq.h

+1-2
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ extern void ABQIterate(ABQ abq, ABQVisitor visitor, void *closure);
4343

4444
typedef struct ABQStruct
4545
{
46+
Sig sig; /* design.mps.sig.field */
4647
Count elements;
4748
Size elementSize;
4849
Index in;
@@ -54,8 +55,6 @@ typedef struct ABQStruct
5455
METER_DECL(pop)
5556
METER_DECL(peek)
5657
METER_DECL(delete)
57-
58-
Sig sig;
5958
} ABQStruct;
6059

6160
#endif /* abq_h */

0 commit comments

Comments
 (0)