Skip to content

Commit

Permalink
Merge branch 'develop' into relax-testing
Browse files Browse the repository at this point in the history
  • Loading branch information
PhilippvK committed Sep 9, 2024
2 parents 2a50c89 + 0254467 commit 173ca5e
Show file tree
Hide file tree
Showing 46 changed files with 3,045 additions and 276 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/bench.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,11 @@ jobs:
matrix:
python-version: ["3.10"]
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: recursive
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
# TODO: caching
Expand Down Expand Up @@ -76,7 +76,7 @@ jobs:
cd scripts/
python bench.py ${{ github.event.inputs.benchmark }} out/
- name: Archive reports
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: results
path: scripts/out/
Expand Down
30 changes: 15 additions & 15 deletions .github/workflows/cicd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,12 +44,12 @@ jobs:
matrix:
python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
- uses: actions/cache@v3
- uses: actions/cache@v4
id: cache-venv # name for referring later
with:
path: |
Expand Down Expand Up @@ -84,12 +84,12 @@ jobs:
python-version: ["3.10"]
if: github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/v')
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
- uses: actions/cache@v3
- uses: actions/cache@v4
id: cache-venv # name for referring later
with:
path: |
Expand All @@ -100,7 +100,7 @@ jobs:
restore-keys: |
build-${{ runner.os }}-${{ matrix.python-version }}-venv-${{ hashFiles('**/requirements*.txt') }}
- name: Archive package
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: mlonmcu
path: dist/
Expand All @@ -118,12 +118,12 @@ jobs:
matrix:
python-version: ["3.10"]
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
- uses: actions/cache@v3
- uses: actions/cache@v4
id: cache-venv # name for referring later
with:
path: |
Expand Down Expand Up @@ -156,7 +156,7 @@ jobs:
source .venv/bin/activate
make coverage-full
- name: Archive code coverage html report
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: code-coverage-report
path: htmlcov
Expand All @@ -182,12 +182,12 @@ jobs:
matrix:
python-version: ["3.10"]
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
- uses: actions/cache@v3
- uses: actions/cache@v4
id: cache-venv # name for referring later
with:
path: |
Expand Down Expand Up @@ -215,7 +215,7 @@ jobs:
source .venv/bin/activate
make docs
- name: Deploy docs
uses: peaceiris/actions-gh-pages@v3
uses: peaceiris/actions-gh-pages@v4
if: ${{ github.ref == 'refs/heads/main' }}
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
Expand Down
46 changes: 23 additions & 23 deletions .github/workflows/container.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,15 +52,15 @@ jobs:
remove-haskell: 'true'
remove-codeql: 'true'
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
submodules: recursive
- name: Set up QEMU
uses: docker/setup-qemu-action@v2
uses: docker/setup-qemu-action@v3
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@v3
- name: Login to GitHub Container Registry
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.actor }}
Expand All @@ -70,11 +70,11 @@ jobs:
./scripts/update_version.sh
- name: Lowercase repository url
id: lowered
uses: ASzc/change-string-case-action@v5
uses: ASzc/change-string-case-action@v6
with:
string: ${{ github.repository }}
- name: Build and push (CMake)
uses: docker/build-push-action@v4
uses: docker/build-push-action@v6
with:
context: .
file: docker/Dockerfile
Expand All @@ -88,7 +88,7 @@ jobs:
cache-to: type=inline
tags: ghcr.io/${{ steps.lowered.outputs.lowercase }}-cmake:${{ github.event.inputs.version }}
- name: Build and push
uses: docker/build-push-action@v4
uses: docker/build-push-action@v6
with:
context: .
file: docker/Dockerfile
Expand Down Expand Up @@ -118,15 +118,15 @@ jobs:
remove-haskell: 'true'
remove-codeql: 'true'
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
submodules: recursive
- name: Set up QEMU
uses: docker/setup-qemu-action@v2
uses: docker/setup-qemu-action@v3
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@v3
- name: Login to GitHub Container Registry
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.actor }}
Expand All @@ -136,11 +136,11 @@ jobs:
./scripts/update_version.sh
- name: Lowercase repository url
id: lowered
uses: ASzc/change-string-case-action@v5
uses: ASzc/change-string-case-action@v6
with:
string: ${{ github.repository }}
# - name: Build and push
# uses: docker/build-push-action@v4
# uses: docker/build-push-action@v6
# with:
# context: .
# file: docker/Dockerfile
Expand All @@ -153,14 +153,14 @@ jobs:
# cache-to: type=inline
# tags: ghcr.io/${{ steps.lowered.outputs.lowercase }}:${{ github.event.inputs.version }}
- name: Login to DockerHub
uses: docker/login-action@v2
uses: docker/login-action@v3
if: ${{ github.repository == 'tum-ei-eda/mlonmcu' }}
with:
registry: ${{ secrets.DOCKER_REGISTRY }}
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}
- name: Build and push to Docker Hub
uses: docker/build-push-action@v4
uses: docker/build-push-action@v6
if: ${{ github.repository == 'tum-ei-eda/mlonmcu' }}
with:
context: .
Expand Down Expand Up @@ -192,26 +192,26 @@ jobs:
remove-haskell: 'true'
remove-codeql: 'true'
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
submodules: recursive
- name: Set up QEMU
uses: docker/setup-qemu-action@v2
uses: docker/setup-qemu-action@v3
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@v3
- name: Login to GitHub Container Registry
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}
- name: Lowercase repository url
id: lowered
uses: ASzc/change-string-case-action@v5
uses: ASzc/change-string-case-action@v6
with:
string: ${{ github.repository }}
# - name: Build and push
# uses: docker/build-push-action@v4
# uses: docker/build-push-action@v6
# with:
# context: .
# file: docker/Dockerfile
Expand All @@ -227,14 +227,14 @@ jobs:
# cache-to: type=inline
# tags: ghcr.io/${{ steps.lowered.outputs.lowercase }}-bench:${{ github.event.inputs.version }}
- name: Login to DockerHub
uses: docker/login-action@v2
uses: docker/login-action@v3
if: ${{ github.repository == 'tum-ei-eda/mlonmcu' }}
with:
registry: ${{ secrets.DOCKER_REGISTRY }}
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}
- name: Build and push to Docker Hub
uses: docker/build-push-action@v4
uses: docker/build-push-action@v6
if: ${{ github.repository == 'tum-ei-eda/mlonmcu' }}
with:
context: .
Expand Down
Loading

0 comments on commit 173ca5e

Please sign in to comment.