Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Patch LLVM #729

Merged
merged 8 commits into from
Mar 7, 2023
Merged

Patch LLVM #729

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f319b5d
gh: bump code version
csegarragonz Mar 4, 2023
a61ef4a
cpp: bump version
csegarragonz Mar 4, 2023
210ddc4
python: bump version
csegarragonz Mar 4, 2023
5576b80
docker: just in-case, bump the cpython version
csegarragonz Mar 4, 2023
92afce6
gha: use docker token instead
csegarragonz Mar 4, 2023
cd1b4a2
wamr: update hash
csegarragonz Mar 4, 2023
de4ac73
gha: use docker hub token
csegarragonz Mar 4, 2023
4495332
cpp, python: bump after merge
csegarragonz Mar 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions .env
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
FAASM_VERSION=0.9.2
FAASM_CLI_IMAGE=faasm/cli:0.9.2
FAASM_WORKER_IMAGE=faasm/worker:0.9.2
FAASM_VERSION=0.9.3
FAASM_CLI_IMAGE=faasm/cli:0.9.3
FAASM_WORKER_IMAGE=faasm/worker:0.9.3

CPP_VERSION=0.2.2
CPP_CLI_IMAGE=faasm/cpp-sysroot:0.2.2
CPP_VERSION=0.2.3
CPP_CLI_IMAGE=faasm/cpp-sysroot:0.2.3

PYTHON_VERSION=0.2.3
PYTHON_CLI_IMAGE=faasm/cpython:0.2.3
PYTHON_VERSION=0.2.4
PYTHON_CLI_IMAGE=faasm/cpython:0.2.4

COMPOSE_PROJECT_NAME=faasm-dev

Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
uses: docker/login-action@v2
with:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}
password: ${{ secrets.DOCKER_TOKEN }}
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As of today, release actions started to fail complaining that we needed to use an access token instead of a password.

- name: "Build container image"
uses: docker/build-push-action@v3
with:
Expand Down Expand Up @@ -64,7 +64,7 @@ jobs:
uses: docker/login-action@v2
with:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}
password: ${{ secrets.DOCKER_TOKEN }}
- name: "Build container image"
uses: docker/build-push-action@v3
with:
Expand Down Expand Up @@ -95,7 +95,7 @@ jobs:
uses: docker/login-action@v2
with:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}
password: ${{ secrets.DOCKER_TOKEN }}
- name: "Build container image"
uses: docker/build-push-action@v3
with:
Expand Down Expand Up @@ -129,7 +129,7 @@ jobs:
uses: docker/login-action@v2
with:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}
password: ${{ secrets.DOCKER_TOKEN }}
- name: "Build container image"
uses: docker/build-push-action@v3
with:
Expand Down
22 changes: 11 additions & 11 deletions .github/workflows/tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
if: github.event.pull_request.draft == false
runs-on: ubuntu-latest
container:
image: faasm/cli:0.9.2
image: faasm/cli:0.9.3
steps:
- name: "Checkout code"
uses: actions/checkout@v3
Expand All @@ -49,7 +49,7 @@ jobs:
if: github.event.pull_request.draft == false
runs-on: ubuntu-latest
container:
image: faasm/cli:0.9.2
image: faasm/cli:0.9.3
steps:
- name: "Checkout code"
uses: actions/checkout@v3
Expand All @@ -62,7 +62,7 @@ jobs:
if: github.event.pull_request.draft == false
runs-on: ubuntu-latest
container:
image: faasm/cpp-sysroot:0.2.2
image: faasm/cpp-sysroot:0.2.3
steps:
- name: "Checkout code"
uses: actions/checkout@v3
Expand Down Expand Up @@ -92,7 +92,7 @@ jobs:
if: github.event.pull_request.draft == false
runs-on: ubuntu-latest
container:
image: faasm/cpython:0.2.3
image: faasm/cpython:0.2.4
steps:
- name: "Checkout code"
uses: actions/checkout@v3
Expand All @@ -119,7 +119,7 @@ jobs:
if: github.event.pull_request.draft == false
runs-on: ubuntu-latest
container:
image: faasm/cli:0.9.2
image: faasm/cli:0.9.3
steps:
- name: "Conan cache"
uses: faasm/conan-cache-action@v1
Expand Down Expand Up @@ -153,12 +153,12 @@ jobs:
TSAN_OPTIONS: "history_size=0 halt_on_error=1 suppressions=./thread-sanitizer-ignorelist.txt flush_memory_ms=5000"
UBSAN_OPTIONS: "print_stacktrace=1:halt_on_error=1:suppressions=./ub-sanitizer-ignorelist.txt"
container:
image: faasm/cli:0.9.2
image: faasm/cli:0.9.3
services:
redis:
image: faasm/redis:0.9.2
image: faasm/redis:0.9.3
minio:
image: faasm/minio:0.9.2
image: faasm/minio:0.9.3
env:
MINIO_ROOT_USER: minio
MINIO_ROOT_PASSWORD: minio123
Expand Down Expand Up @@ -233,12 +233,12 @@ jobs:
REDIS_QUEUE_HOST: redis
REDIS_STATE_HOST: redis
container:
image: faasm/cli-sgx-sim:0.9.2
image: faasm/cli-sgx-sim:0.9.3
services:
redis:
image: faasm/redis:0.9.2
image: faasm/redis:0.9.3
minio:
image: faasm/minio:0.9.2
image: faasm/minio:0.9.3
env:
MINIO_ROOT_USER: minio
MINIO_ROOT_PASSWORD: minio123
Expand Down
2 changes: 1 addition & 1 deletion VERSION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.9.2
0.9.3
2 changes: 1 addition & 1 deletion clients/cpp
Open in desktop
Submodule cpp updated 13 files
+2 −2 .env
+1 −1 .github/workflows/release.yml
+1 −1 .github/workflows/tests.yml
+0 −4 .gitmodules
+1 −1 LLVM.makefile
+1 −1 VERSION
+3 −3 docker/cpp-sysroot.dockerfile
+0 −1 docker/llvm.dockerfile
+1 −1 faasmtools/env.py
+44 −0 patches/llvm-project/0001-Remove-__EMSCRIPTEN__-definitions-from-emscripten-ta.patch
+27 −2 tasks/llvm.py
+3 −1 tasks/util/env.py
+0 −1 third-party/llvm-project
2 changes: 1 addition & 1 deletion clients/python
Open in desktop
Submodule python updated 5 files
+1 −1 .github/workflows/release.yml
+2 −2 .github/workflows/tests.yml
+1 −1 Dockerfile
+1 −1 VERSION
+1 −1 third-party/cpp
2 changes: 1 addition & 1 deletion cmake/ExternalProjects.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ FetchContent_Declare(wavm_ext

FetchContent_Declare(wamr_ext
GIT_REPOSITORY "https://github.com/faasm/wasm-micro-runtime"
GIT_TAG "135672cab24d877db4ef6933c0ab150351384d51"
GIT_TAG "a31e5a4fa299c4f8384f40e157b0a928ad0bda1b"
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See this comment (if you have not seen it yet).

)

# WAMR and WAVM both link to LLVM
Expand Down
2 changes: 1 addition & 1 deletion deploy/k8s-common/minio.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ metadata:
spec:
containers:
- name: minio-main
image: faasm/minio:0.9.2
image: faasm/minio:0.9.3
env:
- name: MINIO_ROOT_USER
value: "minio"
Expand Down
4 changes: 2 additions & 2 deletions deploy/k8s-common/redis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ metadata:
spec:
containers:
- name: master
image: faasm/redis:0.9.2
image: faasm/redis:0.9.3
ports:
- containerPort: 6379

Expand All @@ -28,7 +28,7 @@ metadata:
spec:
containers:
- name: master
image: faasm/redis:0.9.2
image: faasm/redis:0.9.3
ports:
- containerPort: 6379

Expand Down
2 changes: 1 addition & 1 deletion deploy/k8s-sgx/upload.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ metadata:
spec:
containers:
- name: upload
image: faasm/upload:0.9.2
image: faasm/upload:0.9.3
ports:
- containerPort: 8002
- containerPort: 5000
Expand Down
2 changes: 1 addition & 1 deletion deploy/k8s-sgx/worker.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ spec:
weight: 100

containers:
- image: faasm/worker-sgx:0.9.2
- image: faasm/worker-sgx:0.9.3
name: faasm-worker
ports:
- containerPort: 8080
Expand Down
2 changes: 1 addition & 1 deletion deploy/k8s/upload.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ metadata:
spec:
containers:
- name: upload
image: faasm/upload:0.9.2
image: faasm/upload:0.9.3
ports:
- containerPort: 8002
- containerPort: 5000
Expand Down
2 changes: 1 addition & 1 deletion deploy/k8s/worker.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ spec:
weight: 100

containers:
- image: faasm/worker:0.9.2
- image: faasm/worker:0.9.3
name: faasm-worker
ports:
- containerPort: 8080
Expand Down
2 changes: 1 addition & 1 deletion docker/base.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Stage to extract Python runtime files
FROM faasm/cpython:0.2.3 as python
FROM faasm/cpython:0.2.4 as python

# Note - we don't often rebuild cpp-root so this dep may be behind
FROM faasm/cpp-root:0.9.1
Expand Down