Skip to content

Commit ae8c115

Browse files
authored
Bump version and renaming (#30)
1 parent 6f95494 commit ae8c115

File tree

10 files changed

+23
-23
lines changed

10 files changed

+23
-23
lines changed

.env

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
SYSROOT_VERSION=0.0.20
2-
SYSROOT_CLI_IMAGE=faasm/cpp-sysroot:0.0.20
3-
COMPOSE_PROJECT_NAME=faasm-toolchain-dev
1+
SYSROOT_VERSION=0.0.21
2+
SYSROOT_CLI_IMAGE=faasm/cpp-sysroot:0.0.21
3+
COMPOSE_PROJECT_NAME=cpp-dev

.github/workflows/tests.yml

+7-7
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ jobs:
1212
if: github.event.pull_request.draft == false
1313
runs-on: ubuntu-20.04
1414
container:
15-
image: faasm/cpp-sysroot:0.0.20
15+
image: faasm/cpp-sysroot:0.0.21
1616
defaults:
1717
run:
18-
working-directory: /code/faasm-toolchain
18+
working-directory: /code/cpp
1919
steps:
2020
# --- Update code ---
2121
- name: "Fetch ref"
@@ -44,10 +44,10 @@ jobs:
4444
REDIS_QUEUE_HOST: redis
4545
REDIS_STATE_HOST: redis
4646
container:
47-
image: faasm/cpp-sysroot:0.0.20
47+
image: faasm/cpp-sysroot:0.0.21
4848
defaults:
4949
run:
50-
working-directory: /code/faasm-toolchain
50+
working-directory: /code/cpp
5151
services:
5252
redis:
5353
image: redis
@@ -63,7 +63,7 @@ jobs:
6363
- name: "Build the tests"
6464
run: inv dev.cc tests
6565
- name: "Run the tests"
66-
run: /build/faasm-toolchain/static/bin/tests
66+
run: /build/cpp/static/bin/tests
6767

6868
examples:
6969
if: github.event.pull_request.draft == false
@@ -73,10 +73,10 @@ jobs:
7373
REDIS_QUEUE_HOST: redis
7474
REDIS_STATE_HOST: redis
7575
container:
76-
image: faasm/cpp-sysroot:0.0.20
76+
image: faasm/cpp-sysroot:0.0.21
7777
defaults:
7878
run:
79-
working-directory: /code/faasm-toolchain
79+
working-directory: /code/cpp
8080
services:
8181
redis:
8282
image: redis

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Faasm C/C++ Support [![CPP tests](https://github.com/faasm/faasm-toolchain/workflows/Tests/badge.svg?branch=master)](https://github.com/faasm/faasm-toolchain/actions) [![License](https://img.shields.io/github/license/faasm/faasm-toolchain.svg)](https://github.com/faasm/faasm-toolchain/blob/master/LICENSE.md)
1+
# Faasm C/C++ Support [![CPP tests](https://github.com/faasm/cpp/workflows/Tests/badge.svg?branch=master)](https://github.com/faasm/cpp/actions) [![License](https://img.shields.io/github/license/faasm/cpp.svg)](https://github.com/faasm/cpp/blob/master/LICENSE.md)
22

33
This repo contains everything needed to build C/C++ applications for
44
[Faasm](https://github.com/faasm/faasm):

VERSION

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.0.20
1+
0.0.21

bin/run_clang_tidy.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
set -e
44

5-
BUILD_PATH=/build/faasm-toolchain/static/
5+
BUILD_PATH=/build/cpp/static/
66
CONFIG=${FAASM_ROOT}/.clang-tidy
77
DUMP_OUTPUT=true
88

docker-compose.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ services:
99
volumes:
1010
- /var/run/docker.sock:/var/run/docker.sock
1111
- /usr/bin/docker:/usr/bin/docker
12-
- .:/code/faasm-toolchain
13-
- ./build:/build/faasm-toolchain
14-
working_dir: /code/faasm-toolchain
12+
- .:/code/cpp
13+
- ./build:/build/cpp
14+
working_dir: /code/cpp
1515
stdin_open: true
1616
tty: true
1717
privileged: true

docker/cpp-sysroot.dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ RUN apt install -y \
1818

1919
# Get the code
2020
WORKDIR /code
21-
RUN git clone -b v${SYSROOT_VERSION} https://github.com/faasm/faasm-toolchain
22-
WORKDIR /code/faasm-toolchain
21+
RUN git clone -b v${SYSROOT_VERSION} https://github.com/faasm/cpp
22+
WORKDIR /code/cpp
2323

2424
# Update submodules (not LLVM)
2525
RUN git submodule update --init -f third-party/eigen

docs/release.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ The toolchain repo is based on two Docker images:
55
- `faasm/llvm` - the base image holding just the custom LLVM tools
66
- `faasm/cpp-sysroot` - the image holding both the tools and sysroot
77

8-
See the [Actions page](https://github.com/faasm/faasm-toolchain/actions) and
8+
See the [Actions page](https://github.com/faasm/cpp/actions) and
99
[Dockerfiles](docker) for more info.
1010

1111
You only need to rebuild the `llvm` image when upgrading LLVM (see

setup.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
packages=find_packages(),
1515
author="Simon S",
1616
author_email="[email protected]",
17-
description="Utilities related to the Faasm toolchain",
18-
url="https://github.com/faasm/faasm-toolchain",
17+
description="Utilities related to Faasm C++ functions",
18+
url="https://github.com/faasm/cpp",
1919
python_requires=">=3.6",
2020
)

tasks/dev.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010

1111
# Slightly inefficient to have two builds, but we need to make sure all
1212
# dependencies are also build as shared/ static accordingly
13-
SHARED_BUILD_DIR = "/build/faasm-toolchain/shared"
14-
STATIC_BUILD_DIR = "/build/faasm-toolchain/static"
13+
SHARED_BUILD_DIR = "/build/cpp/shared"
14+
STATIC_BUILD_DIR = "/build/cpp/static"
1515

1616

1717
@task

0 commit comments

Comments
 (0)