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.

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

Pull different EMSDK versions according to build type #53

Merged
merged 2 commits into from
Jun 23, 2023
Merged
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -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:
@@ -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'
3 changes: 2 additions & 1 deletion docker/Dockerfile
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 \