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

Use setup-emsdk instead of emscripten dockerfile in samples.yml. #18422

Merged
merged 2 commits into from
Sep 3, 2024
Merged

Use setup-emsdk instead of emscripten dockerfile in samples.yml. #18422

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6a73ecb
Use setup-emsdk instead of emscripten dockerfile in samples.yml.
ScottTodd Sep 3, 2024
104ad6b
Delete emscripten.Dockerfile.
ScottTodd Sep 3, 2024
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
11 changes: 10 additions & 1 deletion .github/workflows/samples.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@ jobs:

web:
runs-on: ubuntu-20.04
container: gcr.io/iree-oss/emscripten@sha256:2dd4c52f1bb499ab365aad0111fe5538b685d88af38636b409b0cf6a576ab214
env:
VENV_DIR: ${{ github.workspace }}/.venv
Copy link
Collaborator

Choose a reason for hiding this comment

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

might be cleaner to add env variables here in future btw

Copy link
Member Author

Choose a reason for hiding this comment

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

Trueee... I could simplify the various places this is done, like

iree/.github/workflows/pkgci_test_android.yml

Lines 64 to 69 in 3bdd909

- name: Install build dependencies
run: |
sudo apt update
sudo apt install -y ninja-build
echo "CC=clang" >> $GITHUB_ENV
echo "CXX=clang++" >> $GITHUB_ENV

Copy link
Member

@marbre marbre Sep 3, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

Do we prefer one over the other? Most workflows I've looked in seem to follow https://docs.github.com/en/actions/writing-workflows/choosing-what-your-workflow-does/store-information-in-variables#defining-environment-variables-for-a-single-workflow and not https://docs.github.com/en/actions/writing-workflows/choosing-what-your-workflow-does/workflow-commands-for-github-actions#setting-an-environment-variable but I don't know what we should prefer.

defaults:
Expand All @@ -74,6 +73,12 @@ jobs:
run: git config --global --add safe.directory '*'
- name: "Check out runtime submodules"
run: ./build_tools/scripts/git/update_runtime_submodules.sh
- name: "Installing build dependencies"
run: |
sudo apt update
sudo apt install -y ninja-build
echo "CC=clang" >> $GITHUB_ENV
echo "CXX=clang++" >> $GITHUB_ENV
- uses: actions/setup-python@v5.1.0
with:
python-version: "3.11"
Expand All @@ -86,6 +91,10 @@ jobs:
--upgrade \
iree-compiler \
iree-runtime
- name: "Setup emsdk"
uses: mymindstorm/setup-emsdk@v14
with:
version: 3.1.44
- name: "Test experimental web samples"
env:
HOST_TOOLS_BINARY_DIR: ${{ env.VENV_DIR }}/bin
Expand Down
46 changes: 0 additions & 46 deletions build_tools/docker/dockerfiles/emscripten.Dockerfile
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion build_tools/docker/manage_images.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@
IMAGES_TO_DEPENDENCIES = {
"base": [],
"base-arm64": [],
"emscripten": ["base"],
"riscv-toolchain-builder": [],
# Containers with all the newest versions of dependencies that we support
# instead of the oldest.
Expand Down
1 change: 0 additions & 1 deletion build_tools/docker/prod_digests.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
gcr.io/iree-oss/base@sha256:dc314b4fe30fc1315742512891357bffed4d1b62ffcb46258b1e0761c737b446
gcr.io/iree-oss/emscripten@sha256:2dd4c52f1bb499ab365aad0111fe5538b685d88af38636b409b0cf6a576ab214
gcr.io/iree-oss/base-bleeding-edge@sha256:cf2e78194e64fd0166f4141317366261d7a62432b72e9a324cb8c2ff4e1a515a
gcr.io/iree-oss/base-arm64@sha256:9daa1cdbbf12da8527319ece76a64d06219e04ecb99a4cff6e6364235ddf6c59
gcr.io/iree-oss/riscv-toolchain-builder@sha256:4240a374d35e5ea9037051559aaae4a8b6414ad5872501d4e240baccaacfff11
Loading