Skip to content

Commit

Permalink
Merge remote-tracking branch 'fork/main' into arm-agnostic-sme-za-state
Browse files Browse the repository at this point in the history
  • Loading branch information
sdesmalen-arm committed Dec 20, 2024
2 parents ee36004 + ff7467b commit 64cceef
Show file tree
Hide file tree
Showing 14 changed files with 4,282 additions and 2,075 deletions.
27 changes: 27 additions & 0 deletions .all-contributorsrc
Original file line number Diff line number Diff line change
Expand Up @@ -324,6 +324,33 @@
"contributions": [
"code"
]
},
{
"login": "Lukacma",
"name": "Lukacma",
"avatar_url": "https://avatars.githubusercontent.com/u/46606997?v=4",
"profile": "https://github.com/Lukacma",
"contributions": [
"doc"
]
},
{
"login": "v01dXYZ",
"name": "Robert Dazi",
"avatar_url": "https://avatars.githubusercontent.com/u/14996868?v=4",
"profile": "https://github.com/v01dXYZ",
"contributions": [
"content"
]
},
{
"login": "SpencerAbson",
"name": "SpencerAbson",
"avatar_url": "https://avatars.githubusercontent.com/u/76910239?v=4",
"profile": "https://github.com/SpencerAbson",
"contributions": [
"content"
]
}
],
"contributorsPerLine": 7,
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,25 +10,25 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4.1.7
- name: check the correctness of the sources and generate the PDFs
run: ./build_with_docker.sh
- uses: actions/upload-artifact@v2
- uses: actions/upload-artifact@v4.4.0
with:
name: pdfs
path: pdfs

build-github-pages:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4.1.7
- name: generate the GitHub Pages locally in order to check for errors
run: ./tools/build-github-pages.sh build

markdown-link-check:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@master
- uses: actions/checkout@v4.1.7
- uses: gaurav-nelson/github-action-markdown-link-check@v1
with:
config-file: '.github/workflows/markdown-link-check.json'
Expand All @@ -37,7 +37,7 @@ jobs:
runs-on: ubuntu-latest
if: github.base_ref == 'main' || github.ref == 'refs/heads/main'
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v4.1.7
with:
fetch-depth: 0
- name: Check correctness of draftversion fields
Expand Down
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
tmp
pdfs
tex2pdf*
tex2pdf*
.DS_Store
7 changes: 6 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
</div>

<!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
[![All Contributors](https://img.shields.io/badge/all_contributors-34-orange.svg?style=flat-square)](#contributors-)
[![All Contributors](https://img.shields.io/badge/all_contributors-37-orange.svg?style=flat-square)](#contributors-)
<!-- ALL-CONTRIBUTORS-BADGE:END -->
![Continuous Integration](https://github.com/ARM-software/acle/actions/workflows/ci.yml/badge.svg)

Expand Down Expand Up @@ -130,6 +130,11 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
<td align="center" valign="top" width="14.28%"><a href="https://github.com/pratlucas"><img src="https://avatars.githubusercontent.com/u/7014318?v=4?s=100" width="100px;" alt="Lucas Duarte Prates"/><br /><sub><b>Lucas Duarte Prates</b></sub></a><br /><a href="https://github.com/ARM-software/acle/commits?author=pratlucas" title="Code">💻</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/andrewcarlotti"><img src="https://avatars.githubusercontent.com/u/11681428?v=4?s=100" width="100px;" alt="Andrew Carlotti"/><br /><sub><b>Andrew Carlotti</b></sub></a><br /><a href="https://github.com/ARM-software/acle/pulls?q=is%3Apr+reviewed-by%3Aandrewcarlotti" title="Reviewed Pull Requests">👀</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/labrinea"><img src="https://avatars.githubusercontent.com/u/9527365?v=4?s=100" width="100px;" alt="Alexandros Lamprineas"/><br /><sub><b>Alexandros Lamprineas</b></sub></a><br /><a href="https://github.com/ARM-software/acle/commits?author=labrinea" title="Code">💻</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/Lukacma"><img src="https://avatars.githubusercontent.com/u/46606997?v=4?s=100" width="100px;" alt="Lukacma"/><br /><sub><b>Lukacma</b></sub></a><br /><a href="https://github.com/ARM-software/acle/commits?author=Lukacma" title="Documentation">📖</a></td>
</tr>
<tr>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/v01dXYZ"><img src="https://avatars.githubusercontent.com/u/14996868?v=4?s=100" width="100px;" alt="Robert Dazi"/><br /><sub><b>Robert Dazi</b></sub></a><br /><a href="#content-v01dXYZ" title="Content">🖋</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/SpencerAbson"><img src="https://avatars.githubusercontent.com/u/76910239?v=4?s=100" width="100px;" alt="SpencerAbson"/><br /><sub><b>SpencerAbson</b></sub></a><br /><a href="#content-SpencerAbson" title="Content">🖋</a></td>
</tr>
</tbody>
</table>
Expand Down
6 changes: 1 addition & 5 deletions cmse/cmse.md
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ exceptions.

First, several changes were made related to the defined terms so as to
reflect the fact that such defined terms need to align with the
terminology in CC-BY-SA-4.0 rather than Apache-2.0 (for example, changing
terminology in CC-BY-SA-4.0 rather than Apache-2.0 (e.g., changing
“Work” to “Licensed Material”).

Second, the defensive termination clause was changed such that the
Expand Down Expand Up @@ -163,10 +163,6 @@ Copyright 2019, 2021-2023 Arm Limited and/or its affiliates <open-source-office@
* Added [Requirement #58](#requirement-58) to address a security issue in the
handling of return values from CMSE Non-secure calls.

#### Changes for next release

* Textual improvements (non-functional changes).

## References

This document refers to the following documents.
Expand Down
Loading

0 comments on commit 64cceef

Please sign in to comment.