Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/tock/tock
Browse files Browse the repository at this point in the history
  • Loading branch information
viswajith-g committed Feb 1, 2025
2 parents 797f3e2 + 83e3fc1 commit 968ab04
Show file tree
Hide file tree
Showing 885 changed files with 24,361 additions and 9,147 deletions.
4 changes: 2 additions & 2 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ out your copy locally.
```text
$ git clone git@github.com:username/tock.git
$ cd tock
$ git remote add upstream git://github.com/tock/tock.git
$ git remote add upstream https://github.com/tock/tock.git
```

### Step 2: Branch
Expand Down Expand Up @@ -138,7 +138,7 @@ Body of commit message is a few lines of text, explaining things
in more detail, possibly giving some background about the issue
being fixed, etc.
If you quote a discussion or some code it should be intended:
If you quote a discussion or some code it should be indented:
Should we have an example of indentation? Yes I think so.
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/benchmarks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:

# Steps represent a sequence of tasks that will be executed as part of the job
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Set up Python
uses: actions/setup-python@v4
with:
Expand Down
38 changes: 22 additions & 16 deletions .github/workflows/ci-nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,16 @@ permissions:

jobs:
ci-build:
# Do not run job on forks
if: github.repository == 'tock/tock'

strategy:
matrix:
os: [ubuntu-latest, macos-latest]
runs-on: ${{ matrix.os }}

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

- name: ci-job-syntax
run: make ci-job-syntax
Expand All @@ -37,12 +40,15 @@ jobs:
- name: ci-job-collect-artifacts
run: make ci-job-collect-artifacts
- name: upload-build-artifacts
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: build-artifacts
path: tools/ci-artifacts

ci-tests:
# Do not run job on forks
if: github.repository == 'tock/tock'

strategy:
matrix:
os: [ubuntu-latest, macos-latest]
Expand All @@ -61,7 +67,7 @@ jobs:
run: |
brew install zeromq
if: matrix.os == 'macos-latest'
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: ci-job-libraries
run: make ci-job-libraries
- name: ci-job-archs
Expand All @@ -73,16 +79,16 @@ jobs:
- name: ci-job-tools
run: make ci-job-tools
- name: Create Issue on Failed workflow
if: failure()
uses: dacbd/create-issue-action@main
with:
token: ${{ github.token }}
title: Nightly CI failed
body: |
### Context
[Failed Run](https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }})
[Codebase](https://github.com/${{ github.repository }}/tree/${{ github.sha }})
Workflow name - `${{ github.workflow }}`
Job - `${{ github.job }}`
status - `${{ job.status }}`
assignees: @tock/core-wg
if: failure()
uses: dacbd/create-issue-action@main
with:
token: ${{ github.token }}
title: Nightly CI failed
body: |
### Context
[Failed Run](https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }})
[Codebase](https://github.com/${{ github.repository }}/tree/${{ github.sha }})
Workflow name - `${{ github.workflow }}`
Job - `${{ github.job }}`
status - `${{ job.status }}`
assignees: tock/core-wg
16 changes: 9 additions & 7 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:

# Steps represent a sequence of tasks that will be executed as part of the job
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: actions/setup-node@v3
- name: ci-job-format
run: make ci-job-format
Expand All @@ -50,7 +50,7 @@ jobs:

# Steps represent a sequence of tasks that will be executed as part of the job
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: ci-job-clippy
run: make ci-job-clippy

Expand All @@ -61,17 +61,19 @@ jobs:
runs-on: ${{ matrix.os }}

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: ci-job-syntax
run: make ci-job-syntax
- name: ci-job-compilation
run: make ci-job-compilation
- name: ci-job-msrv
run: make ci-job-msrv
- name: ci-job-debug-support-targets
run: make ci-job-debug-support-targets
- name: ci-job-collect-artifacts
run: make ci-job-collect-artifacts
- name: upload-build-artifacts
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: build-artifacts
path: tools/ci-artifacts
Expand All @@ -91,7 +93,7 @@ jobs:
run: |
sudo apt install libudev-dev libzmq3-dev
if: matrix.os == 'ubuntu-latest'
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: ci-job-libraries
run: make ci-job-libraries
- name: ci-job-archs
Expand Down Expand Up @@ -120,7 +122,7 @@ jobs:
- name: Install dependencies
continue-on-error: true
run: |
sudo apt install meson
- uses: actions/checkout@v3
sudo apt install meson libglib2.0-dev
- uses: actions/checkout@v4
- name: ci-job-qemu
run: make ci-job-qemu
22 changes: 11 additions & 11 deletions .github/workflows/litex_sim.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
litex-sim-ci:
strategy:
matrix:
os: [ubuntu-latest]
os: [ubuntu-22.04]

# The type of runner that the job will run on
runs-on: ${{ matrix.os }}
Expand All @@ -39,7 +39,7 @@ jobs:
# that other steps (such as the Rust toolchain) depend on files
# in this repo.
- name: Checkout the current repository
uses: actions/checkout@v3
uses: actions/checkout@v4

# Install basic packages required for the GitHub actions workflow
- name: Update packages and install dependencies
Expand All @@ -57,12 +57,12 @@ jobs:
# applications.
- name: Install tockloader
run: |
pip3 install tockloader==1.12.0
pip3 install tockloader==1.13.0
# Clone tock-litex support repository under ./tock-litex, check out the
# targeted release.
- name: Checkout the tock-litex repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
repository: lschuermann/tock-litex
# The pinned revision is different from the targeted release as
Expand Down Expand Up @@ -97,15 +97,15 @@ jobs:
# Revision to checkout defined in the main tock repository in
# .libtock_c_ci_rev
- name: Checkout libtock-c CI revision
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
repository: tock/libtock-c
# Pins a libtock-c revision for LiteX CI tests. In case of
# bugs fixed in libtock-c, backwards-incompatible changes in
# Tock or new tests this might need to be updated.
#
# libtock-c of Feb 9, 2024, 3:08 PM EST
ref: 0e72c922e13cd83a1aaae7a5f587099d45815e6a
# libtock-c of Mon Dec 9 21:35:38 2024 +0000
ref: 820579455300762558718510d89960fd693131c1
path: libtock-c

- name: Build libtock-c apps
Expand All @@ -118,13 +118,13 @@ jobs:
rv32imc|rv32imc.0x00088080.0x40010000|0x00088080|0x40010000"
export LIBTOCK_C_APPS="\
c_hello \
tests/console_timeout \
tests/mpu_walk_region \
tests/console/console_timeout \
tests/mpu/mpu_walk_region \
tests/printf_long \
rot13_service \
rot13_client \
tests/console_recv_short \
tests/console_recv_long"
tests/console/console_recv_short \
tests/console/console_recv_long"
pushd libtock-c/examples
for APP in $LIBTOCK_C_APPS; do
make -C "$APP"
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/mergequeue_docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# production deploy for the master branch. We use this workflow purely as we
# can't have Netlify build the wildcard gh-readonly-queue/* branches. This
# workflow thus ensures that docs build successfully (albeit not in the exact
# same envrionment as Netlify's).
# same environment as Netlify's).
#
# See issue #3428 for more information.

Expand All @@ -28,7 +28,7 @@ jobs:
runs-on: ${{ matrix.os }}

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- # This also sets up the rustup environment
name: ci-netlify-build
run: tools/netlify-build.sh
3 changes: 3 additions & 0 deletions .github/workflows/tockbot-nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@ jobs:
dispatcher:
runs-on: ubuntu-latest

# Do not run job on forks
if: github.repository == 'tock/tock'

# This job determines which other jobs should be run:
outputs:
run-maint-nightly: ${{ steps.dispatch-logic.outputs.run-maint-nightly }}
Expand Down
Loading

0 comments on commit 968ab04

Please sign in to comment.