Skip to content

Pull different EMSDK versions according to build type #53

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

Merged
merged 2 commits into from
Jun 23, 2023
Merged

Pull different EMSDK versions according to build type #53

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
dfbb5f6
Make FROM version conditional on build type
Jaifroid Jun 23, 2023
c9c9b48
Adjust the test
Jaifroid Jun 23, 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
9 changes: 8 additions & 1 deletion .github/workflows/build_libzim_wasm.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ env:
DISPATCH_TYPE: ${{ github.event.inputs.buildtype }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
SSH_KEY: ${{ secrets.SSH_KEY }}
BUILD_TYPE: ${{ github.event.inputs.buildtype }}

jobs:
build:
Expand All @@ -51,7 +52,13 @@ jobs:
- uses: actions/checkout@v3
# Customizes the Emscripten docker container via the Dockerfile in this repo
- name: Build the Docker image
run: docker build -t "docker-emscripten-libzim:v3" ./docker
run: |
if [[ $BUILD_TYPE =~ 'source' ]]; then
BUILD_VERSION='3.1.12'
else
BUILD_VERSION='3.1.41'
fi
docker build -t "docker-emscripten-libzim:v3" ./docker --build-arg VERSION=$BUILD_VERSION
# If we're building release version
- name: Build release from libzim binaries
if: github.event_name == 'pull_request' || github.event_name == 'push' || github.event.inputs.buildtype == 'release'
Expand Down
3 changes: 2 additions & 1 deletion docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# Docker image suitable to build libzim & kiwixlib with emscripten
FROM emscripten/emsdk:3.1.41
ARG VERSION
FROM emscripten/emsdk:${VERSION}

# Install build tools
RUN apt-get update && apt-get install -y --no-install-recommends wget ninja-build pkg-config python3 autopoint libtool autoconf patch g++ locales curl git \
Expand Down